From 9dafac29b563fb46e39dc0deee1c0b112ab725f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sun, 17 Mar 2024 10:29:39 +0100 Subject: [PATCH] chore(tests): Remove deprecations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- tests/SPT/Core/Acl/ActionsTest.php | 8 +-- tests/SPT/Core/Bootstrap/UriContextTest.php | 4 +- tests/SPT/Core/Context/ContextFactoryTest.php | 4 +- tests/SPT/Core/Context/SessionUtilTest.php | 4 +- tests/SPT/Core/Crypt/CryptPKITest.php | 4 +- tests/SPT/Core/Crypt/CryptTest.php | 4 +- tests/SPT/Core/Crypt/CsrfTest.php | 13 ++-- tests/SPT/Core/Crypt/HashTest.php | 3 +- tests/SPT/Core/Crypt/SessionTest.php | 3 +- tests/SPT/Core/Crypt/UuidCookieTest.php | 3 +- tests/SPT/Core/Crypt/VaultTest.php | 3 +- tests/SPT/Core/Events/EventDispatcherTest.php | 7 +- tests/SPT/Core/LanguageTest.php | 4 +- tests/SPT/Core/MimeTypesTest.php | 4 +- tests/SPT/Core/PhpExtensionCheckerTest.php | 8 +-- tests/SPT/Core/UI/ThemeContextTest.php | 3 +- tests/SPT/Core/UI/ThemeIconsTest.php | 3 +- tests/SPT/Core/UI/ThemeTest.php | 3 +- .../Account/Adapters/AccountAdapterTest.php | 3 +- .../Account/Services/AccountAclTest.php | 49 ++++++-------- .../Account/Services/AccountCacheTest.php | 3 +- .../Account/Services/AccountCryptTest.php | 3 +- .../Account/Services/AccountFileTest.php | 3 +- .../Services/AccountFilterUserTest.php | 3 +- .../Account/Services/AccountHistoryTest.php | 3 +- .../Account/Services/AccountPresetTest.php | 3 +- .../Account/Services/AccountSearchTest.php | 16 ++--- .../Domain/Account/Services/AccountTest.php | 3 +- .../Services/AccountToFavoriteTest.php | 3 +- .../Account/Services/AccountToTagTest.php | 3 +- .../Services/AccountToUserGroupTest.php | 3 +- .../Account/Services/AccountToUserTest.php | 3 +- .../Builders/AccountSearchDataTest.php | 3 +- .../Builders/AccountSearchTokenizerTest.php | 16 ++--- .../Account/Services/PublicLinkKeyTest.php | 3 +- .../Account/Services/PublicLinkTest.php | 3 +- .../Services/UpgradePublicLinkTest.php | 3 +- .../Domain/Api/Services/ApiRequestTest.php | 7 +- .../Domain/Api/Services/ApiResponseTest.php | 3 +- tests/SPT/Domain/Api/Services/ApiTest.php | 31 +++------ .../Domain/Auth/Services/AuthTokenTest.php | 8 ++- .../Domain/Category/Services/CategoryTest.php | 3 +- .../SPT/Domain/Client/Services/ClientTest.php | 3 +- .../Config/Services/ConfigBackupTest.php | 3 +- .../Domain/Config/Services/ConfigFileTest.php | 3 +- .../SPT/Domain/Config/Services/ConfigTest.php | 3 +- .../Config/Services/UpgradeConfigTest.php | 6 +- .../Domain/Crypt/Services/MasterPassTest.php | 3 +- .../Services/SecureSessionServiceTest.php | 3 +- .../Services/TemporaryMasterPassTest.php | 3 +- .../Services/CustomFieldCryptTest.php | 3 +- .../Services/CustomFieldDataTest.php | 3 +- .../Services/CustomFieldDefinitionTest.php | 3 +- .../Services/CustomFieldTypeTest.php | 3 +- .../Export/Services/BackupFileHelperTest.php | 3 +- .../Export/Services/FileBackupServiceTest.php | 3 +- .../Export/Services/XmlAccountExportTest.php | 3 +- .../Export/Services/XmlCategoryExportTest.php | 3 +- .../Export/Services/XmlClientExportTest.php | 3 +- .../Domain/Export/Services/XmlExportTest.php | 3 +- .../Export/Services/XmlTagExportTest.php | 3 +- .../Domain/Export/Services/XmlVerifyTest.php | 3 +- .../Domain/Import/Services/CsvImportTest.php | 3 +- .../Import/Services/ImportStrategyTest.php | 13 ++-- .../SPT/Domain/Import/Services/ImportTest.php | 3 +- .../Import/Services/KeepassImportTest.php | 3 +- .../Domain/Import/Services/LdapImportTest.php | 11 +-- .../Import/Services/SyspassImportTest.php | 3 +- .../Domain/Import/Services/XmlFileTest.php | 7 +- .../Domain/Install/Services/InstallerTest.php | 3 +- .../SPT/Domain/Install/Services/MySQLTest.php | 3 +- .../ItemPreset/Services/ItemPresetTest.php | 3 +- tests/SPT/Html/HtmlTest.php | 9 ++- tests/SPT/Html/MinifyCssTest.php | 3 +- tests/SPT/Html/MinifyJsTest.php | 3 +- tests/SPT/Http/AddressTest.php | 16 ++--- tests/SPT/Http/RequestTest.php | 3 +- .../Account/Repositories/AccountFileTest.php | 3 +- .../Repositories/AccountHistoryTest.php | 3 +- .../Repositories/AccountSearchTest.php | 3 +- .../Account/Repositories/AccountTest.php | 3 +- .../Repositories/AccountToFavoriteTest.php | 3 +- .../Account/Repositories/AccountToTagTest.php | 3 +- .../Repositories/AccountToUserGroupTest.php | 3 +- .../Repositories/AccountToUserTest.php | 3 +- .../Account/Repositories/PublicLinkTest.php | 3 +- .../Auth/Repositories/AuthTokenTest.php | 3 +- .../Category/Repositories/CategoryTest.php | 3 +- .../Client/Repositories/ClientTest.php | 3 +- .../Config/Repositories/ConfigTest.php | 3 +- .../Repositories/CustomFieldDataTest.php | 3 +- .../CustomFieldDefinitionTest.php | 3 +- .../Repositories/CustomFieldTypeTest.php | 3 +- .../Repositories/ItemPresetTest.php | 3 +- .../Repositories/NotificationTest.php | 3 +- .../Api/Controllers/AccountControllerTest.php | 10 ++- .../Controllers/CategoryControllerTest.php | 4 +- .../Api/Controllers/ClientControllerTest.php | 4 +- .../Api/Controllers/TagControllerTest.php | 4 +- .../Controllers/UserGroupControllerTest.php | 7 +- tests/SPT/Providers/Acl/AclHandlerTest.php | 13 ++-- tests/SPT/Providers/Auth/AuthProviderTest.php | 3 +- .../Auth/Browser/BrowserAuthTest.php | 3 +- .../Auth/Database/DatabaseAuthTest.php | 3 +- .../Providers/Auth/Ldap/LdapActionsTest.php | 3 +- .../SPT/Providers/Auth/Ldap/LdapAuthTest.php | 3 +- .../Auth/Ldap/LdapConnectionTest.php | 3 +- .../SPT/Providers/Auth/Ldap/LdapMsAdsTest.php | 6 +- tests/SPT/Providers/Auth/Ldap/LdapStdTest.php | 6 +- .../SPT/Providers/Auth/Ldap/LdapUtilTest.php | 7 +- tests/SPT/Util/ChainableTest.php | 2 +- tests/SPT/Util/UtilTest.php | 67 +++++++++---------- 112 files changed, 337 insertions(+), 280 deletions(-) diff --git a/tests/SPT/Core/Acl/ActionsTest.php b/tests/SPT/Core/Acl/ActionsTest.php index c13b84d8..c56eb415 100644 --- a/tests/SPT/Core/Acl/ActionsTest.php +++ b/tests/SPT/Core/Acl/ActionsTest.php @@ -24,6 +24,8 @@ namespace SPT\Core\Acl; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Acl\Actions; @@ -40,9 +42,8 @@ use function PHPUnit\Framework\once; /** * Class ActionsTest - * - * @group unitary */ +#[Group('unitary')] class ActionsTest extends UnitaryTestCase { @@ -60,12 +61,11 @@ class ActionsTest extends UnitaryTestCase } /** - * @dataProvider expirationDataProvider - * * @throws FileException * @throws Exception * @throws ActionNotFoundException */ + #[DataProvider('expirationDataProvider')] public function testResetAndExpired(bool $expiredCache, bool $expiredDate) { $fileTime = self::$faker->randomNumber(); diff --git a/tests/SPT/Core/Bootstrap/UriContextTest.php b/tests/SPT/Core/Bootstrap/UriContextTest.php index bb3dd75b..cbb629d8 100644 --- a/tests/SPT/Core/Bootstrap/UriContextTest.php +++ b/tests/SPT/Core/Bootstrap/UriContextTest.php @@ -24,6 +24,7 @@ namespace SPT\Core\Bootstrap; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use SP\Core\Bootstrap\UriContext; use SP\Domain\Http\RequestInterface; @@ -31,9 +32,8 @@ use SPT\UnitaryTestCase; /** * Class UriContextTest - * - * @group unitary */ +#[Group('unitary')] class UriContextTest extends UnitaryTestCase { /** diff --git a/tests/SPT/Core/Context/ContextFactoryTest.php b/tests/SPT/Core/Context/ContextFactoryTest.php index 18a69819..87693dd3 100644 --- a/tests/SPT/Core/Context/ContextFactoryTest.php +++ b/tests/SPT/Core/Context/ContextFactoryTest.php @@ -24,6 +24,7 @@ namespace SPT\Core\Context; +use PHPUnit\Framework\Attributes\Group; use SP\Core\Context\ContextFactory; use SP\Core\Context\SessionContext; use SP\Core\Context\StatelessContext; @@ -31,9 +32,8 @@ use SPT\UnitaryTestCase; /** * Class ContextFactoryTest - * - * @group unitary */ +#[Group('unitary')] class ContextFactoryTest extends UnitaryTestCase { public function testGetForModuleWithWeb() diff --git a/tests/SPT/Core/Context/SessionUtilTest.php b/tests/SPT/Core/Context/SessionUtilTest.php index 43f76718..55512b2f 100644 --- a/tests/SPT/Core/Context/SessionUtilTest.php +++ b/tests/SPT/Core/Context/SessionUtilTest.php @@ -24,14 +24,14 @@ namespace SPT\Core\Context; +use PHPUnit\Framework\Attributes\Group; use SP\Core\Context\SessionUtil; use SPT\UnitaryTestCase; /** * Class SessionUtilTest - * - * @group unitary */ +#[Group('unitary')] class SessionUtilTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/Crypt/CryptPKITest.php b/tests/SPT/Core/Crypt/CryptPKITest.php index 1fa1a8db..039ee097 100644 --- a/tests/SPT/Core/Crypt/CryptPKITest.php +++ b/tests/SPT/Core/Crypt/CryptPKITest.php @@ -25,6 +25,7 @@ namespace SPT\Core\Crypt; use phpseclib\Crypt\RSA; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Crypt\CryptPKI; @@ -37,9 +38,8 @@ use function PHPUnit\Framework\once; /** * Class CryptPKITest - * - * @group unitary */ +#[Group('unitary')] class CryptPKITest extends UnitaryTestCase { private CryptPKI $cryptPki; diff --git a/tests/SPT/Core/Crypt/CryptTest.php b/tests/SPT/Core/Crypt/CryptTest.php index a2b4b5d1..5b1b4a5c 100644 --- a/tests/SPT/Core/Crypt/CryptTest.php +++ b/tests/SPT/Core/Crypt/CryptTest.php @@ -24,15 +24,15 @@ namespace SPT\Core\Crypt; +use PHPUnit\Framework\Attributes\Group; use SP\Core\Crypt\Crypt; use SP\Domain\Core\Exceptions\CryptException; use SPT\UnitaryTestCase; /** * Class CryptTest - * - * @group unitary */ +#[Group('unitary')] class CryptTest extends UnitaryTestCase { /** diff --git a/tests/SPT/Core/Crypt/CsrfTest.php b/tests/SPT/Core/Crypt/CsrfTest.php index da376811..270c18bc 100644 --- a/tests/SPT/Core/Crypt/CsrfTest.php +++ b/tests/SPT/Core/Crypt/CsrfTest.php @@ -24,6 +24,8 @@ namespace SPT\Core\Crypt; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Crypt\Csrf; use SP\Core\Crypt\Hash; @@ -36,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class CsrfTest * - * @group unitary */ +#[Group('unitary')] class CsrfTest extends UnitaryTestCase { @@ -103,10 +105,9 @@ class CsrfTest extends UnitaryTestCase } /** - * @dataProvider httpMethodDataProvider - * * @return void */ + #[DataProvider('httpMethodDataProvider')] public function testCheckWithValidToken(Method $method, string $header) { $salt = self::$faker->sha1; @@ -150,10 +151,9 @@ class CsrfTest extends UnitaryTestCase /** - * @dataProvider httpMethodDataProvider - * * @return void */ + #[DataProvider('httpMethodDataProvider')] public function testCheckWithInvalidToken(Method $method, string $header) { $this->requestInterface @@ -191,10 +191,9 @@ class CsrfTest extends UnitaryTestCase } /** - * @dataProvider httpMethodDataProvider - * * @return void */ + #[DataProvider('httpMethodDataProvider')] public function testCheckWithNoToken(Method $method, string $header) { $this->requestInterface diff --git a/tests/SPT/Core/Crypt/HashTest.php b/tests/SPT/Core/Crypt/HashTest.php index a40ca3d2..1c93d9c4 100644 --- a/tests/SPT/Core/Crypt/HashTest.php +++ b/tests/SPT/Core/Crypt/HashTest.php @@ -25,14 +25,15 @@ namespace SPT\Core\Crypt; use Faker\Factory; +use PHPUnit\Framework\Attributes\Group; use SP\Core\Crypt\Hash; use SPT\UnitaryTestCase; /** * Class HashTest * - * @group unitary */ +#[Group('unitary')] class HashTest extends UnitaryTestCase { public function testHashKey() diff --git a/tests/SPT/Core/Crypt/SessionTest.php b/tests/SPT/Core/Crypt/SessionTest.php index 24181862..80083ad4 100644 --- a/tests/SPT/Core/Crypt/SessionTest.php +++ b/tests/SPT/Core/Crypt/SessionTest.php @@ -24,6 +24,7 @@ namespace SPT\Core\Crypt; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Crypt\Session; @@ -35,8 +36,8 @@ use SPT\UnitaryTestCase; /** * Class SessionTest * - * @group unitary */ +#[Group('unitary')] class SessionTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/Crypt/UuidCookieTest.php b/tests/SPT/Core/Crypt/UuidCookieTest.php index 461c8dab..21d89c8d 100644 --- a/tests/SPT/Core/Crypt/UuidCookieTest.php +++ b/tests/SPT/Core/Crypt/UuidCookieTest.php @@ -32,12 +32,13 @@ use SP\Core\Crypt\Hash; use SP\Core\Crypt\UuidCookie; use SP\Domain\Http\RequestInterface; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class UuidCookieTest * - * @group unitary */ +#[Group('unitary')] class UuidCookieTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/Crypt/VaultTest.php b/tests/SPT/Core/Crypt/VaultTest.php index 09297ac7..5fab95e4 100644 --- a/tests/SPT/Core/Crypt/VaultTest.php +++ b/tests/SPT/Core/Crypt/VaultTest.php @@ -29,12 +29,13 @@ use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Vault; use SP\Domain\Core\Exceptions\CryptException; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class VaultTest * - * @group unitary */ +#[Group('unitary')] class VaultTest extends UnitaryTestCase { /** diff --git a/tests/SPT/Core/Events/EventDispatcherTest.php b/tests/SPT/Core/Events/EventDispatcherTest.php index 5b2f887e..524e3944 100644 --- a/tests/SPT/Core/Events/EventDispatcherTest.php +++ b/tests/SPT/Core/Events/EventDispatcherTest.php @@ -24,6 +24,8 @@ namespace SPT\Core\Events; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Events\Event; use SP\Core\Events\EventDispatcher; @@ -33,8 +35,8 @@ use SPT\UnitaryTestCase; /** * Class EventDispatcherTest * - * @group unitary */ +#[Group('unitary')] class EventDispatcherTest extends UnitaryTestCase { private const VALID_EVENTS = 'test|foo.bar.event'; @@ -65,10 +67,9 @@ class EventDispatcherTest extends UnitaryTestCase } /** - * @dataProvider eventNameProvider - * * @param string $eventName */ + #[DataProvider('eventNameProvider')] public function testNotify(string $eventName) { $event = new Event($this); diff --git a/tests/SPT/Core/LanguageTest.php b/tests/SPT/Core/LanguageTest.php index 423719bd..38bb8def 100644 --- a/tests/SPT/Core/LanguageTest.php +++ b/tests/SPT/Core/LanguageTest.php @@ -24,6 +24,7 @@ namespace SPT\Core; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Language; use SP\DataModel\UserPreferencesData; @@ -34,9 +35,8 @@ use SPT\UnitaryTestCase; /** * Class LanguageTest - * - * @group unitary */ +#[Group('unitary')] class LanguageTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/MimeTypesTest.php b/tests/SPT/Core/MimeTypesTest.php index 9cca21bb..444cc8e2 100644 --- a/tests/SPT/Core/MimeTypesTest.php +++ b/tests/SPT/Core/MimeTypesTest.php @@ -24,6 +24,7 @@ namespace SPT\Core; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -37,9 +38,8 @@ use SPT\UnitaryTestCase; /** * Class MimeTypesTest - * - * @group unitary */ +#[Group('unitary')] class MimeTypesTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/PhpExtensionCheckerTest.php b/tests/SPT/Core/PhpExtensionCheckerTest.php index 0022ad84..0e6e49c5 100644 --- a/tests/SPT/Core/PhpExtensionCheckerTest.php +++ b/tests/SPT/Core/PhpExtensionCheckerTest.php @@ -24,6 +24,8 @@ namespace SPT\Core; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; use SP\Core\PhpExtensionChecker; use SP\Domain\Core\Exceptions\CheckException; @@ -31,9 +33,8 @@ use SPT\UnitaryTestCase; /** * Class PhpExtensionCheckerTest - * - * @group unitary */ +#[Group('unitary')] class PhpExtensionCheckerTest extends UnitaryTestCase { @@ -48,11 +49,10 @@ class PhpExtensionCheckerTest extends UnitaryTestCase } /** - * @dataProvider extensionMethodDataProvider - * * @param string $method * @return void */ + #[DataProvider('extensionMethodDataProvider')] public function testCallMagicMethod(string $method) { $phpExtensionChecker = new PhpExtensionChecker(); diff --git a/tests/SPT/Core/UI/ThemeContextTest.php b/tests/SPT/Core/UI/ThemeContextTest.php index 6a311542..1d0f6d67 100644 --- a/tests/SPT/Core/UI/ThemeContextTest.php +++ b/tests/SPT/Core/UI/ThemeContextTest.php @@ -24,14 +24,15 @@ namespace SPT\Core\UI; +use PHPUnit\Framework\Attributes\Group; use SP\Core\UI\ThemeContext; use SPT\UnitaryTestCase; /** * Class ThemeContextTest * - * @group unitary */ +#[Group('unitary')] class ThemeContextTest extends UnitaryTestCase { diff --git a/tests/SPT/Core/UI/ThemeIconsTest.php b/tests/SPT/Core/UI/ThemeIconsTest.php index 5ee11131..92ee0838 100644 --- a/tests/SPT/Core/UI/ThemeIconsTest.php +++ b/tests/SPT/Core/UI/ThemeIconsTest.php @@ -24,6 +24,7 @@ namespace SPT\Core\UI; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use SP\Core\UI\ThemeIcons; use SP\Domain\Core\Context\ContextInterface; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class ThemeIconsTest * - * @group unitary */ +#[Group('unitary')] class ThemeIconsTest extends UnitaryTestCase { public function testGetIconByNameWithUnknownIcon() diff --git a/tests/SPT/Core/UI/ThemeTest.php b/tests/SPT/Core/UI/ThemeTest.php index 187154f3..e0ad618f 100644 --- a/tests/SPT/Core/UI/ThemeTest.php +++ b/tests/SPT/Core/UI/ThemeTest.php @@ -25,6 +25,7 @@ namespace SPT\Core\UI; use Directory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class ThemeTest * - * @group unitary */ +#[Group('unitary')] class ThemeTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Adapters/AccountAdapterTest.php b/tests/SPT/Domain/Account/Adapters/AccountAdapterTest.php index 2474ce78..d10709e1 100644 --- a/tests/SPT/Domain/Account/Adapters/AccountAdapterTest.php +++ b/tests/SPT/Domain/Account/Adapters/AccountAdapterTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Account\Adapters; use League\Fractal\Manager; use League\Fractal\Resource\Item; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use SP\DataModel\Action; use SP\Domain\Account\Adapters\AccountAdapter; @@ -41,8 +42,8 @@ use SPT\UnitaryTestCase; /** * Class AccountAdapterTest * - * @group unitary */ +#[Group('unitary')] class AccountAdapterTest extends UnitaryTestCase { /** diff --git a/tests/SPT/Domain/Account/Services/AccountAclTest.php b/tests/SPT/Domain/Account/Services/AccountAclTest.php index 065bdf63..1ea2e0a8 100644 --- a/tests/SPT/Domain/Account/Services/AccountAclTest.php +++ b/tests/SPT/Domain/Account/Services/AccountAclTest.php @@ -24,6 +24,8 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use SP\Core\Acl\Acl; use SP\DataModel\Item; @@ -43,8 +45,8 @@ use SPT\UnitaryTestCase; /** * Class AccountAclServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountAclTest extends UnitaryTestCase { private const ACTIONS = [ @@ -167,11 +169,10 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:admin - * * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] public function testGetAclForAdminApp(): void { $this->context @@ -338,10 +339,9 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:admin - * * @return AccountPermission */ + #[Group('acl:admin')] private function getExampleAclForAdmin(): AccountPermission { return (new AccountPermission(0)) @@ -367,11 +367,10 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:admin - * * @throws QueryException * @throws ConstraintException */ + #[Group('acl:admin')] public function testGetAclForAdminAcc(): void { $this->context @@ -401,9 +400,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -413,6 +409,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testCheckViewPass( int $accountId, int $userId, @@ -437,9 +435,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -449,6 +444,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testCheckDelete( int $accountId, int $userId, @@ -473,9 +470,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -485,6 +479,9 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] + public function testEditPass( int $accountId, int $userId, @@ -509,9 +506,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -521,6 +515,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testEditAndRestore( int $accountId, int $userId, @@ -546,9 +542,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -558,6 +551,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testCheckPermission( int $accountId, int $userId, @@ -582,9 +577,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -594,6 +586,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testViewFiles( int $accountId, int $userId, @@ -618,9 +612,6 @@ class AccountAclTest extends UnitaryTestCase } /** - * @group acl:action - * @dataProvider accountPropertiesProvider - * * @param int $accountId * @param int $userId * @param int $groupId @@ -630,6 +621,8 @@ class AccountAclTest extends UnitaryTestCase * @throws ConstraintException * @throws QueryException */ + #[Group('acl:admin')] + #[DataProvider('accountPropertiesProvider')] public function testCheckView( int $accountId, int $userId, diff --git a/tests/SPT/Domain/Account/Services/AccountCacheTest.php b/tests/SPT/Domain/Account/Services/AccountCacheTest.php index e4fa29bf..5b3f286b 100644 --- a/tests/SPT/Domain/Account/Services/AccountCacheTest.php +++ b/tests/SPT/Domain/Account/Services/AccountCacheTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Dtos\AccountCacheDto; use SP\Domain\Account\Ports\AccountToUserGroupRepository; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class AccountCacheServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountCacheTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountCryptTest.php b/tests/SPT/Domain/Account/Services/AccountCryptTest.php index 8b3d091c..4d47bf87 100644 --- a/tests/SPT/Domain/Account/Services/AccountCryptTest.php +++ b/tests/SPT/Domain/Account/Services/AccountCryptTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -44,8 +45,8 @@ use SPT\UnitaryTestCase; /** * Class AccountCryptServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountCryptTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountFileTest.php b/tests/SPT/Domain/Account/Services/AccountFileTest.php index 5b17ed5d..c3ce49f1 100644 --- a/tests/SPT/Domain/Account/Services/AccountFileTest.php +++ b/tests/SPT/Domain/Account/Services/AccountFileTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\File; use SP\DataModel\FileExtData; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class AccountFileServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountFileTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountFilterUserTest.php b/tests/SPT/Domain/Account/Services/AccountFilterUserTest.php index 46faca7d..3644467d 100644 --- a/tests/SPT/Domain/Account/Services/AccountFilterUserTest.php +++ b/tests/SPT/Domain/Account/Services/AccountFilterUserTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Account\Services; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -35,8 +36,8 @@ use SPT\UnitaryTestCase; /** * Class AccountFilterUserTest * - * @group unitary */ +#[Group('unitary')] class AccountFilterUserTest extends UnitaryTestCase { private const WHERE_HASHES = [ diff --git a/tests/SPT/Domain/Account/Services/AccountHistoryTest.php b/tests/SPT/Domain/Account/Services/AccountHistoryTest.php index aeb9cf08..40f27230 100644 --- a/tests/SPT/Domain/Account/Services/AccountHistoryTest.php +++ b/tests/SPT/Domain/Account/Services/AccountHistoryTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; use SP\Domain\Account\Dtos\AccountHistoryCreateDto; @@ -41,8 +42,8 @@ use SPT\UnitaryTestCase; /** * Class AccountHistoryServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountHistoryTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountPresetTest.php b/tests/SPT/Domain/Account/Services/AccountPresetTest.php index 5d89b7b4..fa50ea33 100644 --- a/tests/SPT/Domain/Account/Services/AccountPresetTest.php +++ b/tests/SPT/Domain/Account/Services/AccountPresetTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemPreset\Password; use SP\Domain\Account\Ports\AccountToUserGroupRepository; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class AccountPresetServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountPresetTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountSearchTest.php b/tests/SPT/Domain/Account/Services/AccountSearchTest.php index eff2116e..25f92f08 100644 --- a/tests/SPT/Domain/Account/Services/AccountSearchTest.php +++ b/tests/SPT/Domain/Account/Services/AccountSearchTest.php @@ -24,6 +24,8 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Builder\InvocationStubber; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -46,8 +48,8 @@ use SPT\UnitaryTestCase; /** * Class AccountSearchServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountSearchTest extends UnitaryTestCase { use AccountSearchTokenizerDataTrait; @@ -57,12 +59,11 @@ class AccountSearchTest extends UnitaryTestCase private AccountSearchDataBuilder|MockObject $accountSearchDataBuilder; /** - * @dataProvider searchUsingStringDataProvider - * * @throws QueryException * @throws ConstraintException * @throws SPException */ + #[DataProvider('searchUsingStringDataProvider')] public function testGetByFilter(string $search) { $accountSearchFilter = AccountSearchFilterDto::build($search); @@ -82,12 +83,11 @@ class AccountSearchTest extends UnitaryTestCase } /** - * @dataProvider searchByItemDataProvider - * * @throws QueryException * @throws ConstraintException * @throws SPException */ + #[DataProvider('searchByItemDataProvider')] public function testGetByFilterUsingItems(string $search, array $expected) { $accountSearchFilter = AccountSearchFilterDto::build($search); @@ -153,12 +153,11 @@ class AccountSearchTest extends UnitaryTestCase } /** - * @dataProvider searchByItemDataProvider - * * @throws QueryException * @throws ConstraintException * @throws SPException */ + #[DataProvider('searchByItemDataProvider')] public function testGetByFilterUsingItemsDoesNotThrowException(string $search, array $expected) { $accountSearchFilter = AccountSearchFilterDto::build($search); @@ -181,12 +180,11 @@ class AccountSearchTest extends UnitaryTestCase } /** - * @dataProvider searchByConditionDataProvider - * * @throws QueryException * @throws ConstraintException * @throws SPException */ + #[DataProvider('searchByConditionDataProvider')] public function testGetByFilterUsingConditions(string $search, array $expected) { $accountSearchFilter = AccountSearchFilterDto::build($search); diff --git a/tests/SPT/Domain/Account/Services/AccountTest.php b/tests/SPT/Domain/Account/Services/AccountTest.php index 92624250..4f20fac7 100644 --- a/tests/SPT/Domain/Account/Services/AccountTest.php +++ b/tests/SPT/Domain/Account/Services/AccountTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemPreset\AccountPrivate; @@ -60,8 +61,8 @@ use SPT\UnitaryTestCase; /** * Class AccountServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountTest extends UnitaryTestCase { private AccountRepository|MockObject $accountRepository; diff --git a/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php b/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php index 13e6410a..99abdfa7 100644 --- a/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php +++ b/tests/SPT/Domain/Account/Services/AccountToFavoriteTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Ports\AccountToFavoriteRepository; use SP\Domain\Account\Services\AccountToFavorite; @@ -36,8 +37,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToFavoriteServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountToFavoriteTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountToTagTest.php b/tests/SPT/Domain/Account/Services/AccountToTagTest.php index 919e7ebc..513d72b4 100644 --- a/tests/SPT/Domain/Account/Services/AccountToTagTest.php +++ b/tests/SPT/Domain/Account/Services/AccountToTagTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Item; use SP\Domain\Account\Ports\AccountToTagRepository; @@ -38,8 +39,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToTagServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountToTagTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php b/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php index c4a84489..6cf4c417 100644 --- a/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php +++ b/tests/SPT/Domain/Account/Services/AccountToUserGroupTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Item; use SP\Domain\Account\Ports\AccountToUserGroupRepository; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToUserGroupServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountToUserGroupTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/AccountToUserTest.php b/tests/SPT/Domain/Account/Services/AccountToUserTest.php index 04403d1b..e57e6ad0 100644 --- a/tests/SPT/Domain/Account/Services/AccountToUserTest.php +++ b/tests/SPT/Domain/Account/Services/AccountToUserTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Item; use SP\Domain\Account\Ports\AccountToUserRepository; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToUserServiceTest * - * @group unitary */ +#[Group('unitary')] class AccountToUserTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/Builders/AccountSearchDataTest.php b/tests/SPT/Domain/Account/Services/Builders/AccountSearchDataTest.php index 425a5866..44b986f6 100644 --- a/tests/SPT/Domain/Account/Services/Builders/AccountSearchDataTest.php +++ b/tests/SPT/Domain/Account/Services/Builders/AccountSearchDataTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services\Builders; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Ports\AccountAclService; use SP\Domain\Account\Ports\AccountCacheService; @@ -45,8 +46,8 @@ use function PHPUnit\Framework\once; /** * Class AccountSearchDataBuilderTest * - * @group unitary */ +#[Group('unitary')] class AccountSearchDataTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/Builders/AccountSearchTokenizerTest.php b/tests/SPT/Domain/Account/Services/Builders/AccountSearchTokenizerTest.php index 13135ab7..217c65c7 100644 --- a/tests/SPT/Domain/Account/Services/Builders/AccountSearchTokenizerTest.php +++ b/tests/SPT/Domain/Account/Services/Builders/AccountSearchTokenizerTest.php @@ -24,26 +24,27 @@ namespace SPT\Domain\Account\Services\Builders; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use SP\Domain\Account\Services\Builders\AccountSearchTokenizer; use SPT\UnitaryTestCase; /** * Class AccountSearchTokenizerTest * - * @group unitary */ +#[Group('unitary')] class AccountSearchTokenizerTest extends UnitaryTestCase { use AccountSearchTokenizerDataTrait; /** - * @dataProvider searchByItemDataProvider - * * @param string $search * @param array $expectedConditions * * @return void */ + #[DataProvider('searchByItemDataProvider')] public function testTokenizeFromFilterByItems(string $search, array $expectedConditions): void { $tokenizer = new AccountSearchTokenizer(); @@ -54,13 +55,12 @@ class AccountSearchTokenizerTest extends UnitaryTestCase } /** - * @dataProvider searchByConditionDataProvider - * * @param string $search * @param array $expectedConditions * * @return void */ + #[DataProvider('searchByConditionDataProvider')] public function testTokenizeFromFilterByCondition(string $search, array $expectedConditions): void { $tokenizer = new AccountSearchTokenizer(); @@ -71,13 +71,12 @@ class AccountSearchTokenizerTest extends UnitaryTestCase } /** - * @dataProvider searchUsingOperatorDataProvider - * * @param string $search * @param string|null $expectedCondition * * @return void */ + #[DataProvider('searchUsingOperatorDataProvider')] public function testTokenizeFromFilterUsingOperator(string $search, ?string $expectedCondition): void { $tokenizer = new AccountSearchTokenizer(); @@ -88,13 +87,12 @@ class AccountSearchTokenizerTest extends UnitaryTestCase } /** - * @dataProvider searchUsingStringDataProvider - * * @param string $search * @param string $expectedString * * @return void */ + #[DataProvider('searchUsingStringDataProvider')] public function testTokenizeFromFilterUsingSearchString(string $search, string $expectedString): void { $tokenizer = new AccountSearchTokenizer(); diff --git a/tests/SPT/Domain/Account/Services/PublicLinkKeyTest.php b/tests/SPT/Domain/Account/Services/PublicLinkKeyTest.php index f553e1c4..ffecaa45 100644 --- a/tests/SPT/Domain/Account/Services/PublicLinkKeyTest.php +++ b/tests/SPT/Domain/Account/Services/PublicLinkKeyTest.php @@ -25,14 +25,15 @@ namespace SPT\Domain\Account\Services; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; +use PHPUnit\Framework\Attributes\Group; use SP\Domain\Account\Dtos\PublicLinkKey; use SPT\UnitaryTestCase; /** * Class PublicLinkKeyTest * - * @group unitary */ +#[Group('unitary')] class PublicLinkKeyTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/PublicLinkTest.php b/tests/SPT/Domain/Account/Services/PublicLinkTest.php index bea15a28..257aaaf3 100644 --- a/tests/SPT/Domain/Account/Services/PublicLinkTest.php +++ b/tests/SPT/Domain/Account/Services/PublicLinkTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Account\Services; use Defuse\Crypto\Exception\CryptoException; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -49,8 +50,8 @@ use SPT\UnitaryTestCase; /** * Class PublicLinkServiceTest * - * @group unitary */ +#[Group('unitary')] class PublicLinkTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php b/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php index d1f15a02..f864e1df 100644 --- a/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php +++ b/tests/SPT/Domain/Account/Services/UpgradePublicLinkTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Account\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\PublickLinkOldData; use SP\Domain\Account\Ports\PublicLinkRepository; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class UpgradePublicLinkServiceTest * - * @group unitary */ +#[Group('unitary')] class UpgradePublicLinkTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Api/Services/ApiRequestTest.php b/tests/SPT/Domain/Api/Services/ApiRequestTest.php index 7bcdada6..710a2ec6 100644 --- a/tests/SPT/Domain/Api/Services/ApiRequestTest.php +++ b/tests/SPT/Domain/Api/Services/ApiRequestTest.php @@ -25,6 +25,8 @@ namespace SPT\Domain\Api\Services; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use SP\Domain\Api\Services\ApiRequest; use SP\Domain\Api\Services\ApiRequestException; use SPT\UnitaryTestCase; @@ -32,8 +34,8 @@ use SPT\UnitaryTestCase; /** * Class ApiRequestTest * - * @group unitary */ +#[Group('unitary')] class ApiRequestTest extends UnitaryTestCase { /** @@ -97,11 +99,10 @@ class ApiRequestTest extends UnitaryTestCase } /** - * @dataProvider getJsonRpcProperty - * * @throws ApiRequestException * @throws JsonException */ + #[DataProvider('getJsonRpcProperty')] public function testBuildFromRequestWithoutProperty(string $property) { $stream = tempnam(sys_get_temp_dir(), time()); diff --git a/tests/SPT/Domain/Api/Services/ApiResponseTest.php b/tests/SPT/Domain/Api/Services/ApiResponseTest.php index 0ad203e2..1351fdc4 100644 --- a/tests/SPT/Domain/Api/Services/ApiResponseTest.php +++ b/tests/SPT/Domain/Api/Services/ApiResponseTest.php @@ -24,14 +24,15 @@ namespace SPT\Domain\Api\Services; +use PHPUnit\Framework\Attributes\Group; use SP\Domain\Api\Dtos\ApiResponse; use SPT\UnitaryTestCase; /** * Class ApiResponseTest * - * @group unitary */ +#[Group('unitary')] class ApiResponseTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Api/Services/ApiTest.php b/tests/SPT/Domain/Api/Services/ApiTest.php index 8cc24491..479a5ab4 100644 --- a/tests/SPT/Domain/Api/Services/ApiTest.php +++ b/tests/SPT/Domain/Api/Services/ApiTest.php @@ -26,6 +26,8 @@ namespace SPT\Domain\Api\Services; use Exception; use Faker\Factory; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use ReflectionClass; use SP\Core\Context\ContextException; @@ -58,8 +60,8 @@ use function PHPUnit\Framework\onConsecutiveCalls; /** * Class ApiServiceTest * - * @group unitary */ +#[Group('unitary')] class ApiTest extends UnitaryTestCase { @@ -151,13 +153,12 @@ class ApiTest extends UnitaryTestCase } /** - * @dataProvider getParamDataProvider - * * @param mixed $value * @param mixed $expected * @param bool $required * @param bool $present */ + #[DataProvider('getParamDataProvider')] public function testGetParam(mixed $value, mixed $expected, bool $required, bool $present) { $this->checkParam([$this->apiService, 'getParam'], ...func_get_args()); @@ -242,9 +243,7 @@ class ApiTest extends UnitaryTestCase $this->apiService->setHelpClass(stdClass::class); } - /** - * @dataProvider getParamIntDataProvider - */ + #[DataProvider('getParamIntDataProvider')] public function testGetParamInt(mixed $value, mixed $expected, bool $required, bool $present) { $this->checkParam([$this->apiService, 'getParamInt'], ...func_get_args()); @@ -527,31 +526,19 @@ class ApiTest extends UnitaryTestCase $this->apiService->setup($actionId); } - /** - * @dataProvider getParamStringDataProvider - * - * @return void - */ - public function testGetParamString(mixed $value, mixed $expected, bool $required, bool $present) + #[DataProvider('getParamStringDataProvider')] + public function testGetParamString(mixed $value, mixed $expected, bool $required, bool $present): void { $this->checkParam([$this->apiService, 'getParamString'], ...func_get_args()); } - /** - * @dataProvider getParamArrayDataProvider - * - * @return void - */ + #[DataProvider('getParamArrayDataProvider')] public function testGetParamArray(mixed $value, mixed $expected, bool $required, bool $present) { $this->checkParam([$this->apiService, 'getParamArray'], ...func_get_args()); } - /** - * @dataProvider getParamRawDataProvider - * - * @return void - */ + #[DataProvider('getParamRawDataProvider')] public function testGetParamRaw(mixed $value, mixed $expected, bool $required, bool $present) { $this->checkParam([$this->apiService, 'getParamRaw'], ...func_get_args()); diff --git a/tests/SPT/Domain/Auth/Services/AuthTokenTest.php b/tests/SPT/Domain/Auth/Services/AuthTokenTest.php index ab879fb8..efe2698e 100644 --- a/tests/SPT/Domain/Auth/Services/AuthTokenTest.php +++ b/tests/SPT/Domain/Auth/Services/AuthTokenTest.php @@ -27,6 +27,8 @@ namespace SPT\Domain\Auth\Services; use Defuse\Crypto\Exception\CryptoException; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; use Exception; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -50,8 +52,8 @@ use SPT\UnitaryTestCase; /** * Class AuthTokenTest * - * @group unitary */ +#[Group('unitary')] class AuthTokenTest extends UnitaryTestCase { @@ -213,7 +215,6 @@ class AuthTokenTest extends UnitaryTestCase } /** - * @dataProvider secureActionDataProvider * @param int $action * @throws ConstraintException * @throws CryptoException @@ -222,6 +223,7 @@ class AuthTokenTest extends UnitaryTestCase * @throws SPException * @throws ContextException */ + #[DataProvider('secureActionDataProvider')] public function testCreateWithSecureAction(int $action) { $this->context->setTrasientKey('_masterpass', 'test_pass'); @@ -409,7 +411,6 @@ class AuthTokenTest extends UnitaryTestCase } /** - * @dataProvider secureActionDataProvider * @param int $action * @throws ConstraintException * @throws CryptoException @@ -418,6 +419,7 @@ class AuthTokenTest extends UnitaryTestCase * @throws SPException * @throws ContextException */ + #[DataProvider('secureActionDataProvider')] public function testUpdateWithSecureAction(int $action) { $this->context->setTrasientKey('_masterpass', 'test_pass'); diff --git a/tests/SPT/Domain/Category/Services/CategoryTest.php b/tests/SPT/Domain/Category/Services/CategoryTest.php index 2b96d916..fee83c99 100644 --- a/tests/SPT/Domain/Category/Services/CategoryTest.php +++ b/tests/SPT/Domain/Category/Services/CategoryTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Category\Services; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Category\Ports\CategoryRepository; use SP\Domain\Category\Services\Category; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class CategoryTest * - * @group unitary */ +#[Group('unitary')] class CategoryTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Client/Services/ClientTest.php b/tests/SPT/Domain/Client/Services/ClientTest.php index bf2779fb..108840d4 100644 --- a/tests/SPT/Domain/Client/Services/ClientTest.php +++ b/tests/SPT/Domain/Client/Services/ClientTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Client\Services; use Aura\SqlQuery\QueryFactory; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; use SP\Domain\Account\Ports\AccountFilterBuilder; @@ -45,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class CategoryTest * - * @group unitary */ +#[Group('unitary')] class ClientTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Config/Services/ConfigBackupTest.php b/tests/SPT/Domain/Config/Services/ConfigBackupTest.php index 5a5b5e70..c6bb7b5f 100644 --- a/tests/SPT/Domain/Config/Services/ConfigBackupTest.php +++ b/tests/SPT/Domain/Config/Services/ConfigBackupTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Config\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Common\Services\ServiceException; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class ConfigBackupTest * - * @group unitary */ +#[Group('unitary')] class ConfigBackupTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Config/Services/ConfigFileTest.php b/tests/SPT/Domain/Config/Services/ConfigFileTest.php index 3edf190c..3d06e10d 100644 --- a/tests/SPT/Domain/Config/Services/ConfigFileTest.php +++ b/tests/SPT/Domain/Config/Services/ConfigFileTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Config\Services; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class ConfigFileTest * - * @group unitary */ +#[Group('unitary')] class ConfigFileTest extends UnitaryTestCase { private XmlFileStorageService|MockObject $fileStorageService; diff --git a/tests/SPT/Domain/Config/Services/ConfigTest.php b/tests/SPT/Domain/Config/Services/ConfigTest.php index 6a8cdd93..956da3da 100644 --- a/tests/SPT/Domain/Config/Services/ConfigTest.php +++ b/tests/SPT/Domain/Config/Services/ConfigTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Config\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class ConfigTest * - * @group unitary */ +#[Group('unitary')] class ConfigTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php b/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php index b6007719..9492d5cc 100644 --- a/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php +++ b/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php @@ -24,6 +24,8 @@ namespace SPT\Domain\Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Application; @@ -40,8 +42,8 @@ use SPT\UnitaryTestCase; /** * Class UpgradeConfigTest * - * @group unitary */ +#[Group('unitary')] class UpgradeConfigTest extends UnitaryTestCase { @@ -132,9 +134,9 @@ class UpgradeConfigTest extends UnitaryTestCase } /** - * @dataProvider versionDataProvider * @return void */ + #[DataProvider('versionDataProvider')] public function testNeedsUpgrade(string $version, bool $expected) { $this->assertEquals($expected, UpgradeConfig::needsUpgrade($version)); diff --git a/tests/SPT/Domain/Crypt/Services/MasterPassTest.php b/tests/SPT/Domain/Crypt/Services/MasterPassTest.php index 8d219c6d..6d830d42 100644 --- a/tests/SPT/Domain/Crypt/Services/MasterPassTest.php +++ b/tests/SPT/Domain/Crypt/Services/MasterPassTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Crypt\Services; use Dotenv\Repository\RepositoryInterface; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Ports\AccountCryptService; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class MasterPassTest * - * @group unitary */ +#[Group('unitary')] class MasterPassTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Crypt/Services/SecureSessionServiceTest.php b/tests/SPT/Domain/Crypt/Services/SecureSessionServiceTest.php index abd1d444..efe935f6 100644 --- a/tests/SPT/Domain/Crypt/Services/SecureSessionServiceTest.php +++ b/tests/SPT/Domain/Crypt/Services/SecureSessionServiceTest.php @@ -27,6 +27,7 @@ namespace SPT\Domain\Crypt\Services; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; use Defuse\Crypto\Key; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; use SP\Core\Crypt\Crypt; @@ -44,8 +45,8 @@ use SPT\UnitaryTestCase; /** * Class SecureSessionServiceTest * - * @group unitary */ +#[Group('unitary')] class SecureSessionServiceTest extends UnitaryTestCase { private SecureSession $secureSessionService; diff --git a/tests/SPT/Domain/Crypt/Services/TemporaryMasterPassTest.php b/tests/SPT/Domain/Crypt/Services/TemporaryMasterPassTest.php index 3237a98e..55f20617 100644 --- a/tests/SPT/Domain/Crypt/Services/TemporaryMasterPassTest.php +++ b/tests/SPT/Domain/Crypt/Services/TemporaryMasterPassTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Crypt\Services; use PHPMailer\PHPMailer\Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -46,8 +47,8 @@ use SPT\UnitaryTestCase; /** * Class TemporaryMasterPassTest * - * @group unitary */ +#[Group('unitary')] class TemporaryMasterPassTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/CustomField/Services/CustomFieldCryptTest.php b/tests/SPT/Domain/CustomField/Services/CustomFieldCryptTest.php index 0d59c5c3..661f4734 100644 --- a/tests/SPT/Domain/CustomField/Services/CustomFieldCryptTest.php +++ b/tests/SPT/Domain/CustomField/Services/CustomFieldCryptTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\CustomField\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class CustomFieldCryptTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldCryptTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/CustomField/Services/CustomFieldDataTest.php b/tests/SPT/Domain/CustomField/Services/CustomFieldDataTest.php index 49534e32..5910ca17 100644 --- a/tests/SPT/Domain/CustomField/Services/CustomFieldDataTest.php +++ b/tests/SPT/Domain/CustomField/Services/CustomFieldDataTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\CustomField\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -48,8 +49,8 @@ use TypeError; /** * Class CustomFieldDataTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldDataTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/CustomField/Services/CustomFieldDefinitionTest.php b/tests/SPT/Domain/CustomField/Services/CustomFieldDefinitionTest.php index 66c1bea8..3eeee806 100644 --- a/tests/SPT/Domain/CustomField/Services/CustomFieldDefinitionTest.php +++ b/tests/SPT/Domain/CustomField/Services/CustomFieldDefinitionTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\CustomField\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Common\Services\ServiceException; @@ -42,8 +43,8 @@ use TypeError; /** * Class CustomFieldDefinitionTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldDefinitionTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/CustomField/Services/CustomFieldTypeTest.php b/tests/SPT/Domain/CustomField/Services/CustomFieldTypeTest.php index d0a6334a..1f647678 100644 --- a/tests/SPT/Domain/CustomField/Services/CustomFieldTypeTest.php +++ b/tests/SPT/Domain/CustomField/Services/CustomFieldTypeTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\CustomField\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Core\Exceptions\ConstraintException; use SP\Domain\Core\Exceptions\QueryException; @@ -39,8 +40,8 @@ use TypeError; /** * Class CustomFieldTypeTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldTypeTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Export/Services/BackupFileHelperTest.php b/tests/SPT/Domain/Export/Services/BackupFileHelperTest.php index e816c388..f77ac549 100644 --- a/tests/SPT/Domain/Export/Services/BackupFileHelperTest.php +++ b/tests/SPT/Domain/Export/Services/BackupFileHelperTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Export\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class BackupFileHelperTest * - * @group unitary */ +#[Group('unitary')] class BackupFileHelperTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Export/Services/FileBackupServiceTest.php b/tests/SPT/Domain/Export/Services/FileBackupServiceTest.php index 137d5b6e..d9916670 100644 --- a/tests/SPT/Domain/Export/Services/FileBackupServiceTest.php +++ b/tests/SPT/Domain/Export/Services/FileBackupServiceTest.php @@ -26,6 +26,7 @@ namespace SPT\Domain\Export\Services; use PDO; use PDOStatement; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -48,8 +49,8 @@ use SPT\UnitaryTestCase; /** * Class FileBackupServiceTest * - * @group unitary */ +#[Group('unitary')] class FileBackupServiceTest extends UnitaryTestCase { private BackupFile $fileBackupService; diff --git a/tests/SPT/Domain/Export/Services/XmlAccountExportTest.php b/tests/SPT/Domain/Export/Services/XmlAccountExportTest.php index c3f00388..84e86f65 100644 --- a/tests/SPT/Domain/Export/Services/XmlAccountExportTest.php +++ b/tests/SPT/Domain/Export/Services/XmlAccountExportTest.php @@ -35,12 +35,13 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Export\Services\XmlAccountExport; use SPT\Generators\AccountDataGenerator; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlAccountExportTest * - * @group unitary */ +#[Group('unitary')] class XmlAccountExportTest extends UnitaryTestCase { use XmlTrait; diff --git a/tests/SPT/Domain/Export/Services/XmlCategoryExportTest.php b/tests/SPT/Domain/Export/Services/XmlCategoryExportTest.php index 4e897d83..ba313aa0 100644 --- a/tests/SPT/Domain/Export/Services/XmlCategoryExportTest.php +++ b/tests/SPT/Domain/Export/Services/XmlCategoryExportTest.php @@ -33,12 +33,13 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Export\Services\XmlCategoryExport; use SPT\Generators\CategoryGenerator; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlCategoryExportTest * - * @group unitary */ +#[Group('unitary')] class XmlCategoryExportTest extends UnitaryTestCase { use XmlTrait; diff --git a/tests/SPT/Domain/Export/Services/XmlClientExportTest.php b/tests/SPT/Domain/Export/Services/XmlClientExportTest.php index 62d7dbac..a4ae1866 100644 --- a/tests/SPT/Domain/Export/Services/XmlClientExportTest.php +++ b/tests/SPT/Domain/Export/Services/XmlClientExportTest.php @@ -33,12 +33,13 @@ use SP\Domain\Common\Services\ServiceException; use SP\Domain\Export\Services\XmlClientExport; use SPT\Generators\ClientGenerator; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlClientExportTest * - * @group unitary */ +#[Group('unitary')] class XmlClientExportTest extends UnitaryTestCase { use XmlTrait; diff --git a/tests/SPT/Domain/Export/Services/XmlExportTest.php b/tests/SPT/Domain/Export/Services/XmlExportTest.php index ade666df..b0ac2629 100644 --- a/tests/SPT/Domain/Export/Services/XmlExportTest.php +++ b/tests/SPT/Domain/Export/Services/XmlExportTest.php @@ -49,12 +49,13 @@ use SP\Domain\File\Ports\DirectoryHandlerService; use SP\Infrastructure\File\FileException; use SP\Util\VersionUtil; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlExportTest * - * @group unitary */ +#[Group('unitary')] class XmlExportTest extends UnitaryTestCase { use XmlTrait; diff --git a/tests/SPT/Domain/Export/Services/XmlTagExportTest.php b/tests/SPT/Domain/Export/Services/XmlTagExportTest.php index 0c8e72a3..4e6b81fe 100644 --- a/tests/SPT/Domain/Export/Services/XmlTagExportTest.php +++ b/tests/SPT/Domain/Export/Services/XmlTagExportTest.php @@ -33,12 +33,13 @@ use SP\Domain\Export\Services\XmlTagExport; use SP\Domain\Tag\Ports\TagService; use SPT\Generators\TagGenerator; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlTagExportTest * - * @group unitary */ +#[Group('unitary')] class XmlTagExportTest extends UnitaryTestCase { use XmlTrait; diff --git a/tests/SPT/Domain/Export/Services/XmlVerifyTest.php b/tests/SPT/Domain/Export/Services/XmlVerifyTest.php index ce7cf821..ee4b2593 100644 --- a/tests/SPT/Domain/Export/Services/XmlVerifyTest.php +++ b/tests/SPT/Domain/Export/Services/XmlVerifyTest.php @@ -35,12 +35,13 @@ use SP\Domain\Core\Crypt\CryptInterface; use SP\Domain\Core\Exceptions\CryptException; use SP\Domain\Export\Services\XmlVerify; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlVerifyTest * - * @group unitary */ +#[Group('unitary')] class XmlVerifyTest extends UnitaryTestCase { private const VALID_ENCRYPTED_FILE = RESOURCE_PATH . DIRECTORY_SEPARATOR . 'import' . DIRECTORY_SEPARATOR . diff --git a/tests/SPT/Domain/Import/Services/CsvImportTest.php b/tests/SPT/Domain/Import/Services/CsvImportTest.php index f217defb..2fea2217 100644 --- a/tests/SPT/Domain/Import/Services/CsvImportTest.php +++ b/tests/SPT/Domain/Import/Services/CsvImportTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Import\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Rule\InvokedCount; @@ -47,8 +48,8 @@ use SPT\UnitaryTestCase; /** * Class CsvImportTest * - * @group unitary */ +#[Group('unitary')] class CsvImportTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Import/Services/ImportStrategyTest.php b/tests/SPT/Domain/Import/Services/ImportStrategyTest.php index c8ac886a..ff0ad38b 100644 --- a/tests/SPT/Domain/Import/Services/ImportStrategyTest.php +++ b/tests/SPT/Domain/Import/Services/ImportStrategyTest.php @@ -25,6 +25,8 @@ namespace SPT\Domain\Import\Services; use DOMDocument; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Core\Crypt\CryptInterface; @@ -44,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class ImportStrategyTest * - * @group unitary */ +#[Group('unitary')] class ImportStrategyTest extends UnitaryTestCase { @@ -69,12 +71,11 @@ class ImportStrategyTest extends UnitaryTestCase } /** - * @dataProvider csvImportProvider - * * @throws ImportException * @throws Exception * @throws FileException */ + #[DataProvider('csvImportProvider')] public function testBuildImportWithCsv(string $fileType) { $fileHandler = $this->createMock(FileHandlerInterface::class); @@ -95,12 +96,11 @@ class ImportStrategyTest extends UnitaryTestCase } /** - * @dataProvider xmlImportProvider - * * @throws ImportException * @throws Exception * @throws FileException */ + #[DataProvider('xmlImportProvider')] public function testBuildImportWithSyspassXml(string $fileType) { $fileHandler = $this->createMock(FileHandlerInterface::class); @@ -136,12 +136,11 @@ class ImportStrategyTest extends UnitaryTestCase } /** - * @dataProvider xmlImportProvider - * * @throws ImportException * @throws Exception * @throws FileException */ + #[DataProvider('xmlImportProvider')] public function testBuildImportWithKeepassXml(string $fileType) { $fileHandler = $this->createMock(FileHandlerInterface::class); diff --git a/tests/SPT/Domain/Import/Services/ImportTest.php b/tests/SPT/Domain/Import/Services/ImportTest.php index 0f91fd27..a93f6f85 100644 --- a/tests/SPT/Domain/Import/Services/ImportTest.php +++ b/tests/SPT/Domain/Import/Services/ImportTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\Import\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -38,8 +39,8 @@ use SPT\UnitaryTestCase; /** * Class ImportTest * - * @group unitary */ +#[Group('unitary')] class ImportTest extends UnitaryTestCase { private Repository|MockObject $repository; diff --git a/tests/SPT/Domain/Import/Services/KeepassImportTest.php b/tests/SPT/Domain/Import/Services/KeepassImportTest.php index 5ef5a383..3ee42732 100644 --- a/tests/SPT/Domain/Import/Services/KeepassImportTest.php +++ b/tests/SPT/Domain/Import/Services/KeepassImportTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Import\Services; use DOMDocument; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Ports\AccountService; @@ -44,8 +45,8 @@ use SPT\UnitaryTestCase; /** * Class KeepassImportTest * - * @group unitary */ +#[Group('unitary')] class KeepassImportTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Import/Services/LdapImportTest.php b/tests/SPT/Domain/Import/Services/LdapImportTest.php index a6ad7dab..65ecd109 100644 --- a/tests/SPT/Domain/Import/Services/LdapImportTest.php +++ b/tests/SPT/Domain/Import/Services/LdapImportTest.php @@ -25,6 +25,8 @@ namespace SPT\Domain\Import\Services; use ArrayIterator; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; use SP\DataModel\User; @@ -44,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class LdapImportTest * - * @group unitary */ +#[Group('unitary')] class LdapImportTest extends UnitaryTestCase { @@ -178,9 +180,9 @@ class LdapImportTest extends UnitaryTestCase } /** - * @dataProvider userFilterByTypeProvider * @throws LdapException */ + #[DataProvider('userFilterByTypeProvider')] public function testImportUsersWithFilterByType(LdapTypeEnum $ldapTypeEnum, string $filter) { $ldapParams = new LdapParams( @@ -247,10 +249,9 @@ class LdapImportTest extends UnitaryTestCase } /** - * @dataProvider emptyNameOrLoginProvider - * * @throws LdapException */ + #[DataProvider('emptyNameOrLoginProvider')] public function testImportUsersWithEmptyNameOrLogin(array $entry) { $ldapParams = new LdapParams( @@ -412,9 +413,9 @@ class LdapImportTest extends UnitaryTestCase } /** - * @dataProvider groupFilterByTypeProvider * @throws LdapException */ + #[DataProvider('groupFilterByTypeProvider')] public function testImportGroupsWithFilterByType(LdapTypeEnum $ldapTypeEnum, string $filter) { $ldapParams = new LdapParams( diff --git a/tests/SPT/Domain/Import/Services/SyspassImportTest.php b/tests/SPT/Domain/Import/Services/SyspassImportTest.php index c9697b3f..91ab4a63 100644 --- a/tests/SPT/Domain/Import/Services/SyspassImportTest.php +++ b/tests/SPT/Domain/Import/Services/SyspassImportTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Import\Services; use DOMDocument; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Rule\InvokedCount; @@ -51,8 +52,8 @@ use SPT\UnitaryTestCase; /** * Class SyspassImportTest * - * @group unitary */ +#[Group('unitary')] class SyspassImportTest extends UnitaryTestCase { diff --git a/tests/SPT/Domain/Import/Services/XmlFileTest.php b/tests/SPT/Domain/Import/Services/XmlFileTest.php index 14275829..3fc754c6 100644 --- a/tests/SPT/Domain/Import/Services/XmlFileTest.php +++ b/tests/SPT/Domain/Import/Services/XmlFileTest.php @@ -24,18 +24,20 @@ namespace SPT\Domain\Import\Services; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Import\Services\ImportException; use SP\Domain\Import\Services\XmlFile; use SP\Domain\Import\Services\XmlFormat; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; use SPT\UnitaryTestCase; +use PHPUnit\Framework\Attributes\Group; /** * Class XmlFileTest * - * @group unitary */ +#[Group('unitary')] class XmlFileTest extends UnitaryTestCase { private const KEEPASS_FILE = RESOURCE_PATH . DIRECTORY_SEPARATOR . 'import' . DIRECTORY_SEPARATOR . @@ -52,11 +54,10 @@ class XmlFileTest extends UnitaryTestCase } /** - * @dataProvider fileFormatProvider - * * @throws ImportException * @throws FileException */ + #[DataProvider('fileFormatProvider')] public function testDetectFormat(string $file, XmlFormat $format) { $fileHandler = new FileHandler($file); diff --git a/tests/SPT/Domain/Install/Services/InstallerTest.php b/tests/SPT/Domain/Install/Services/InstallerTest.php index 0c3b324d..f9464658 100644 --- a/tests/SPT/Domain/Install/Services/InstallerTest.php +++ b/tests/SPT/Domain/Install/Services/InstallerTest.php @@ -25,6 +25,7 @@ namespace SPT\Domain\Install\Services; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\Stub; use SP\Domain\Config\Ports\ConfigService; @@ -46,8 +47,8 @@ use SPT\UnitaryTestCase; /** * Class InstallerTest * - * @group unitary */ +#[Group('unitary')] class InstallerTest extends UnitaryTestCase { /** diff --git a/tests/SPT/Domain/Install/Services/MySQLTest.php b/tests/SPT/Domain/Install/Services/MySQLTest.php index 26c87169..6ba67416 100644 --- a/tests/SPT/Domain/Install/Services/MySQLTest.php +++ b/tests/SPT/Domain/Install/Services/MySQLTest.php @@ -27,6 +27,7 @@ namespace SPT\Domain\Install\Services; use PDO; use PDOException; use PDOStatement; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -46,8 +47,8 @@ use function SP\__u; /** * Class MySQLTest * - * @group unitary */ +#[Group('unitary')] class MySQLTest extends UnitaryTestCase { private DbStorageInterface|MockObject $dbStorage; diff --git a/tests/SPT/Domain/ItemPreset/Services/ItemPresetTest.php b/tests/SPT/Domain/ItemPreset/Services/ItemPresetTest.php index c643b0b5..7dba9aee 100644 --- a/tests/SPT/Domain/ItemPreset/Services/ItemPresetTest.php +++ b/tests/SPT/Domain/ItemPreset/Services/ItemPresetTest.php @@ -24,6 +24,7 @@ namespace SPT\Domain\ItemPreset\Services; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Common\Services\ServiceException; @@ -41,8 +42,8 @@ use SPT\UnitaryTestCase; /** * Class ItemPresetTest * - * @group unitary */ +#[Group('unitary')] class ItemPresetTest extends UnitaryTestCase { diff --git a/tests/SPT/Html/HtmlTest.php b/tests/SPT/Html/HtmlTest.php index b4259cc3..64e94885 100644 --- a/tests/SPT/Html/HtmlTest.php +++ b/tests/SPT/Html/HtmlTest.php @@ -24,14 +24,16 @@ namespace SPT\Html; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use SP\Html\Html; use SPT\UnitaryTestCase; /** * Class HtmlTest * - * @group unitary */ +#[Group('unitary')] class HtmlTest extends UnitaryTestCase { @@ -54,10 +56,7 @@ class HtmlTest extends UnitaryTestCase $this->assertEquals($url, Html::getSafeUrl($url)); } - /** - * @dataProvider urlProvider - * @return void - */ + #[DataProvider('urlProvider')] public function testGetSafeUrlEncoded(string $url) { $this->assertEquals(0, preg_match('/["<>\']+/', Html::getSafeUrl($url))); diff --git a/tests/SPT/Html/MinifyCssTest.php b/tests/SPT/Html/MinifyCssTest.php index 948f581d..945d839e 100644 --- a/tests/SPT/Html/MinifyCssTest.php +++ b/tests/SPT/Html/MinifyCssTest.php @@ -28,6 +28,7 @@ use Klein\DataCollection\HeaderDataCollection; use Klein\DataCollection\ServerDataCollection; use Klein\Request; use Klein\Response; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -41,8 +42,8 @@ use TypeError; /** * Class MinifyCssTest * - * @group unitary */ +#[Group('unitary')] class MinifyCssTest extends UnitaryTestCase { diff --git a/tests/SPT/Html/MinifyJsTest.php b/tests/SPT/Html/MinifyJsTest.php index 08df0e60..fd799e02 100644 --- a/tests/SPT/Html/MinifyJsTest.php +++ b/tests/SPT/Html/MinifyJsTest.php @@ -28,6 +28,7 @@ use Klein\DataCollection\HeaderDataCollection; use Klein\DataCollection\ServerDataCollection; use Klein\Request; use Klein\Response; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -41,8 +42,8 @@ use TypeError; /** * Class MinifyJsTest * - * @group unitary */ +#[Group('unitary')] class MinifyJsTest extends UnitaryTestCase { diff --git a/tests/SPT/Http/AddressTest.php b/tests/SPT/Http/AddressTest.php index c5a43d4f..ea520830 100644 --- a/tests/SPT/Http/AddressTest.php +++ b/tests/SPT/Http/AddressTest.php @@ -25,6 +25,8 @@ namespace SPT\Http; use Faker\Factory; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use SP\Domain\Core\Exceptions\InvalidArgumentException; use SP\Http\Address; use SPT\UnitaryTestCase; @@ -32,8 +34,8 @@ use SPT\UnitaryTestCase; /** * Class AddressTest * - * @group unitary */ +#[Group('unitary')] class AddressTest extends UnitaryTestCase { @@ -108,12 +110,11 @@ class AddressTest extends UnitaryTestCase } /** - * @dataProvider binaryCheckProvider - * * @param string $address * * @throws InvalidArgumentException */ + #[DataProvider('binaryCheckProvider')] public function testToBinary(string $address) { $binary = Address::toBinary($address); @@ -178,8 +179,6 @@ class AddressTest extends UnitaryTestCase } /** - * @dataProvider checkAddressProvider - * * @param string $address * @param string $inAddress * @param string $inMask @@ -187,14 +186,13 @@ class AddressTest extends UnitaryTestCase * * @throws InvalidArgumentException */ + #[DataProvider('checkAddressProvider')] public function testCheck(string $address, string $inAddress, string $inMask, bool $expected) { $this->assertEquals($expected, Address::check($address, $inAddress, $inMask)); } /** - * @dataProvider checkAddressCidrProvider - * * @param string $address * @param string $inAddress * @param string $inMask @@ -202,6 +200,7 @@ class AddressTest extends UnitaryTestCase * * @throws InvalidArgumentException */ + #[DataProvider('checkAddressCidrProvider')] public function testCheckWithCidr(string $address, string $inAddress, string $inMask, bool $expected) { $this->assertEquals($expected, Address::check($address, $inAddress, Address::cidrToDec($inMask))); @@ -304,11 +303,10 @@ class AddressTest extends UnitaryTestCase } /** - * @dataProvider checkCidrProvider - * * @param $cidr * @param $mask */ + #[DataProvider('checkCidrProvider')] public function testCidrToDec($cidr, $mask) { $this->assertEquals($mask, Address::cidrToDec($cidr)); diff --git a/tests/SPT/Http/RequestTest.php b/tests/SPT/Http/RequestTest.php index d1aef498..aa84705b 100644 --- a/tests/SPT/Http/RequestTest.php +++ b/tests/SPT/Http/RequestTest.php @@ -26,6 +26,7 @@ namespace SPT\Http; use Klein\DataCollection\DataCollection; use Klein\DataCollection\HeaderDataCollection; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; @@ -41,8 +42,8 @@ use function PHPUnit\Framework\exactly; /** * Class RequestTest * - * @group unitary */ +#[Group('unitary')] class RequestTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php index 374c06dc..90ce12a7 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountFileTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\File; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class AccountFileRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountFileTest extends UnitaryTestCase { private DatabaseInterface|MockObject $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php index 9a4825e8..c678e020 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountHistoryTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class AccountHistoryRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountHistoryTest extends UnitaryTestCase { private DatabaseInterface|MockObject $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php index 2f649ec6..517049a3 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountSearchTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Dtos\AccountSearchFilterDto; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class AccountSearchRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountSearchTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountTest.php index 347d165f..6e1ac79c 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -46,8 +47,8 @@ use SPT\UnitaryTestCase; /** * Class AccountRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountTest extends UnitaryTestCase { private DatabaseInterface|MockObject $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php index 2a0d4aa8..5341014c 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToFavoriteTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Common\Models\Simple; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToFavoriteRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountToFavoriteTest extends UnitaryTestCase { private MockObject|DatabaseInterface $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php index 8a671fc8..09c3d659 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToTagTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -41,8 +42,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToTagRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountToTagTest extends UnitaryTestCase { private MockObject|DatabaseInterface $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php index 5fb9b709..138e795d 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserGroupTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Item; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToUserGroupRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountToUserGroupTest extends UnitaryTestCase { private MockObject|DatabaseInterface $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php index 9dd0ffa5..935575bf 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/AccountToUserTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Item; @@ -39,8 +40,8 @@ use SPT\UnitaryTestCase; /** * Class AccountToUserRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AccountToUserTest extends UnitaryTestCase { private MockObject|DatabaseInterface $database; diff --git a/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php b/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php index ad22b1c3..b43dc3ea 100644 --- a/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php +++ b/tests/SPT/Infrastructure/Account/Repositories/PublicLinkTest.php @@ -25,6 +25,7 @@ namespace SPT\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class PublicLinkRepositoryTest * - * @group unitary */ +#[Group('unitary')] class PublicLinkTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Auth/Repositories/AuthTokenTest.php b/tests/SPT/Infrastructure/Auth/Repositories/AuthTokenTest.php index 29a12d1d..503d7f93 100644 --- a/tests/SPT/Infrastructure/Auth/Repositories/AuthTokenTest.php +++ b/tests/SPT/Infrastructure/Auth/Repositories/AuthTokenTest.php @@ -29,6 +29,7 @@ use Aura\SqlQuery\Common\InsertInterface; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -47,8 +48,8 @@ use SPT\UnitaryTestCase; /** * Class AuthTokenRepositoryTest * - * @group unitary */ +#[Group('unitary')] class AuthTokenTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Category/Repositories/CategoryTest.php b/tests/SPT/Infrastructure/Category/Repositories/CategoryTest.php index df421372..07bb33ce 100644 --- a/tests/SPT/Infrastructure/Category/Repositories/CategoryTest.php +++ b/tests/SPT/Infrastructure/Category/Repositories/CategoryTest.php @@ -30,6 +30,7 @@ use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -48,8 +49,8 @@ use SPT\UnitaryTestCase; /** * Class CategoryRepositoryTest * - * @group unitary */ +#[Group('unitary')] class CategoryTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Client/Repositories/ClientTest.php b/tests/SPT/Infrastructure/Client/Repositories/ClientTest.php index 9afe334e..edb54548 100644 --- a/tests/SPT/Infrastructure/Client/Repositories/ClientTest.php +++ b/tests/SPT/Infrastructure/Client/Repositories/ClientTest.php @@ -30,6 +30,7 @@ use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -50,8 +51,8 @@ use SPT\UnitaryTestCase; /** * Class ClientRepositoryTest * - * @group unitary */ +#[Group('unitary')] class ClientTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Config/Repositories/ConfigTest.php b/tests/SPT/Infrastructure/Config/Repositories/ConfigTest.php index 4d9c0cae..87ff06df 100644 --- a/tests/SPT/Infrastructure/Config/Repositories/ConfigTest.php +++ b/tests/SPT/Infrastructure/Config/Repositories/ConfigTest.php @@ -28,6 +28,7 @@ use Aura\SqlQuery\Common\InsertInterface; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use SP\Domain\Common\Models\Simple; use SP\Domain\Config\Models\Config as ConfigModel; @@ -43,8 +44,8 @@ use SPT\UnitaryTestCase; /** * Class ConfigTest * - * @group unitary */ +#[Group('unitary')] class ConfigTest extends UnitaryTestCase { private Config $configRepository; diff --git a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDataTest.php b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDataTest.php index 3075d81a..96d763c4 100644 --- a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDataTest.php +++ b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDataTest.php @@ -30,6 +30,7 @@ use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use SP\Domain\Common\Models\Simple as SimpleModel; use SP\Domain\Core\Exceptions\ConstraintException; @@ -45,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class CustomFieldDataTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldDataTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDefinitionTest.php b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDefinitionTest.php index 6087b96a..2d6b189e 100644 --- a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDefinitionTest.php +++ b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldDefinitionTest.php @@ -29,6 +29,7 @@ use Aura\SqlQuery\Common\InsertInterface; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; @@ -45,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class CustomFieldDefinitionTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldDefinitionTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldTypeTest.php b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldTypeTest.php index b8473f2b..ae9c56ea 100644 --- a/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldTypeTest.php +++ b/tests/SPT/Infrastructure/CustomField/Repositories/CustomFieldTypeTest.php @@ -26,6 +26,7 @@ namespace SPT\Infrastructure\CustomField\Repositories; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\CustomField\Models\CustomFieldType as CustomFieldTypeModel; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class CustomFieldTypeTest * - * @group unitary */ +#[Group('unitary')] class CustomFieldTypeTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/ItemPreset/Repositories/ItemPresetTest.php b/tests/SPT/Infrastructure/ItemPreset/Repositories/ItemPresetTest.php index 5923361d..689ec11d 100644 --- a/tests/SPT/Infrastructure/ItemPreset/Repositories/ItemPresetTest.php +++ b/tests/SPT/Infrastructure/ItemPreset/Repositories/ItemPresetTest.php @@ -30,6 +30,7 @@ use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; use Exception; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Models\Simple; @@ -47,8 +48,8 @@ use stdClass; /** * Class ItemPresetTest * - * @group unitary */ +#[Group('unitary')] class ItemPresetTest extends UnitaryTestCase { diff --git a/tests/SPT/Infrastructure/Notification/Repositories/NotificationTest.php b/tests/SPT/Infrastructure/Notification/Repositories/NotificationTest.php index 7c9142b9..20895cc8 100644 --- a/tests/SPT/Infrastructure/Notification/Repositories/NotificationTest.php +++ b/tests/SPT/Infrastructure/Notification/Repositories/NotificationTest.php @@ -29,6 +29,7 @@ use Aura\SqlQuery\Common\InsertInterface; use Aura\SqlQuery\Common\SelectInterface; use Aura\SqlQuery\Common\UpdateInterface; use Aura\SqlQuery\QueryFactory; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Models\Simple; @@ -45,8 +46,8 @@ use SPT\UnitaryTestCase; /** * Class NotificationTest * - * @group unitary */ +#[Group('unitary')] class NotificationTest extends UnitaryTestCase { diff --git a/tests/SPT/Modules/Api/Controllers/AccountControllerTest.php b/tests/SPT/Modules/Api/Controllers/AccountControllerTest.php index 2861206d..87539658 100644 --- a/tests/SPT/Modules/Api/Controllers/AccountControllerTest.php +++ b/tests/SPT/Modules/Api/Controllers/AccountControllerTest.php @@ -27,6 +27,7 @@ namespace SPT\Modules\Api\Controllers; use DI\DependencyException; use DI\NotFoundException; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Core\Acl\AclActionsInterface; use SP\Modules\Api\Controllers\Account\AccountController; use SPT\Modules\Api\ApiTestCase; @@ -153,12 +154,11 @@ class AccountControllerTest extends ApiTestCase } /** - * @dataProvider getUnsetParams - * * @throws DependencyException * @throws NotFoundException * @throws JsonException */ + #[DataProvider('getUnsetParams')] public function testCreateActionRequiredParameters(string $unsetParam): void { $params = self::PARAMS; @@ -410,12 +410,11 @@ class AccountControllerTest extends ApiTestCase } /** - * @dataProvider searchProvider - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('searchProvider')] public function testSearchActionByFilter(array $filter, int $resultsCount): void { $api = $this->callApi( @@ -522,12 +521,11 @@ class AccountControllerTest extends ApiTestCase } /** - * @dataProvider getUnsetParams - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('getUnsetParams')] public function testEditActionRequiredParameter(string $unsetParam): void { $response = $this->createAccount(); diff --git a/tests/SPT/Modules/Api/Controllers/CategoryControllerTest.php b/tests/SPT/Modules/Api/Controllers/CategoryControllerTest.php index 36cb0592..c2f0c657 100644 --- a/tests/SPT/Modules/Api/Controllers/CategoryControllerTest.php +++ b/tests/SPT/Modules/Api/Controllers/CategoryControllerTest.php @@ -27,6 +27,7 @@ namespace SPT\Modules\Api\Controllers; use DI\DependencyException; use DI\NotFoundException; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Core\Acl\AclActionsInterface; use SPT\Modules\Api\ApiTestCase; use stdClass; @@ -292,12 +293,11 @@ class CategoryControllerTest extends ApiTestCase } /** - * @dataProvider searchProvider - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('searchProvider')] public function testSearchActionByFilter(array $filter, int $resultsCount): void { $api = $this->callApi( diff --git a/tests/SPT/Modules/Api/Controllers/ClientControllerTest.php b/tests/SPT/Modules/Api/Controllers/ClientControllerTest.php index c0e42123..71e14d54 100644 --- a/tests/SPT/Modules/Api/Controllers/ClientControllerTest.php +++ b/tests/SPT/Modules/Api/Controllers/ClientControllerTest.php @@ -27,6 +27,7 @@ namespace SPT\Modules\Api\Controllers; use DI\DependencyException; use DI\NotFoundException; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Core\Acl\AclActionsInterface; use SPT\Modules\Api\ApiTestCase; use stdClass; @@ -298,12 +299,11 @@ class ClientControllerTest extends ApiTestCase } /** - * @dataProvider searchProvider - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('searchProvider')] public function testSearchActionByFilter(array $filter, int $resultsCount): void { $api = $this->callApi( diff --git a/tests/SPT/Modules/Api/Controllers/TagControllerTest.php b/tests/SPT/Modules/Api/Controllers/TagControllerTest.php index 38a02530..6c9f1d4b 100644 --- a/tests/SPT/Modules/Api/Controllers/TagControllerTest.php +++ b/tests/SPT/Modules/Api/Controllers/TagControllerTest.php @@ -27,6 +27,7 @@ namespace SPT\Modules\Api\Controllers; use DI\DependencyException; use DI\NotFoundException; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Core\Acl\AclActionsInterface; use SPT\Modules\Api\ApiTestCase; use stdClass; @@ -276,12 +277,11 @@ class TagControllerTest extends ApiTestCase } /** - * @dataProvider searchProvider - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('searchProvider')] public function testSearchActionByFilter(array $filter, int $resultsCount): void { $api = $this->callApi( diff --git a/tests/SPT/Modules/Api/Controllers/UserGroupControllerTest.php b/tests/SPT/Modules/Api/Controllers/UserGroupControllerTest.php index 949c962b..3d217dec 100644 --- a/tests/SPT/Modules/Api/Controllers/UserGroupControllerTest.php +++ b/tests/SPT/Modules/Api/Controllers/UserGroupControllerTest.php @@ -27,6 +27,7 @@ namespace SPT\Modules\Api\Controllers; use DI\DependencyException; use DI\NotFoundException; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use SP\Domain\Core\Acl\AclActionsInterface; use SPT\Modules\Api\ApiTestCase; use stdClass; @@ -182,12 +183,11 @@ class UserGroupControllerTest extends ApiTestCase } /** - * @dataProvider getGroupUsers - * * @throws DependencyException * @throws NotFoundException * @throws JsonException */ + #[DataProvider('getGroupUsers')] public function testEditAction(array $users, int $usersCount): void { $response = $this->createUserGroup(self::PARAMS); @@ -313,12 +313,11 @@ class UserGroupControllerTest extends ApiTestCase } /** - * @dataProvider searchProvider - * * @throws DependencyException * @throws JsonException * @throws NotFoundException */ + #[DataProvider('searchProvider')] public function testSearchActionByFilter(array $filter, int $resultsCount): void { $api = $this->callApi( diff --git a/tests/SPT/Providers/Acl/AclHandlerTest.php b/tests/SPT/Providers/Acl/AclHandlerTest.php index c3cc8902..61e6e60b 100644 --- a/tests/SPT/Providers/Acl/AclHandlerTest.php +++ b/tests/SPT/Providers/Acl/AclHandlerTest.php @@ -24,6 +24,8 @@ namespace SPT\Providers\Acl; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Events\Event; @@ -37,8 +39,8 @@ use SPT\UnitaryTestCase; /** * Class AclHandlerTest * - * @group unitary */ +#[Group('unitary')] class AclHandlerTest extends UnitaryTestCase { private MockObject|UserProfileServiceInterface $userProfileService; @@ -113,11 +115,10 @@ class AclHandlerTest extends UnitaryTestCase } /** - * @dataProvider userEventProvider - * * @throws Exception * @throws SPException */ + #[DataProvider('userEventProvider')] public function testUpdateWithUserEvent(string $userEvent) { $event = $this->createMock(Event::class); @@ -129,11 +130,10 @@ class AclHandlerTest extends UnitaryTestCase } /** - * @dataProvider userEventProvider - * * @throws Exception * @throws SPException */ + #[DataProvider('userEventProvider')] public function testUpdateWithUserEventWithExtra(string $userEvent) { $eventMessage = $this->createMock(EventMessage::class); @@ -149,11 +149,10 @@ class AclHandlerTest extends UnitaryTestCase } /** - * @dataProvider userEventProvider - * * @throws Exception * @throws SPException */ + #[DataProvider('userEventProvider')] public function testUpdateWithUserEventWithoutExtra(string $userEvent) { $eventMessage = $this->createMock(EventMessage::class); diff --git a/tests/SPT/Providers/Auth/AuthProviderTest.php b/tests/SPT/Providers/Auth/AuthProviderTest.php index b2c2dc99..60f0782e 100644 --- a/tests/SPT/Providers/Auth/AuthProviderTest.php +++ b/tests/SPT/Providers/Auth/AuthProviderTest.php @@ -24,6 +24,7 @@ namespace SPT\Providers\Auth; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use SP\DataModel\UserLoginData; use SP\Domain\Auth\Services\AuthException; @@ -36,8 +37,8 @@ use SPT\UnitaryTestCase; /** * Class AuthProviderTest * - * @group unitary */ +#[Group('unitary')] class AuthProviderTest extends UnitaryTestCase { diff --git a/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php b/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php index e8ce361d..5bbcbe4b 100644 --- a/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php +++ b/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php @@ -24,6 +24,7 @@ namespace SPT\Providers\Auth\Browser; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\UserLoginData; use SP\Domain\Config\Ports\ConfigDataInterface; @@ -35,8 +36,8 @@ use SPT\UnitaryTestCase; /** * Class BrowserAuthTest * - * @group unitary */ +#[Group('unitary')] class BrowserAuthTest extends UnitaryTestCase { diff --git a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php b/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php index 32e7602a..ab6c4eb3 100644 --- a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php +++ b/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php @@ -24,6 +24,7 @@ namespace SPT\Providers\Auth\Database; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Crypt\Hash; use SP\DataModel\UserLoginData; @@ -37,8 +38,8 @@ use SPT\UnitaryTestCase; /** * Class DatabaseAuthTest * - * @group unitary */ +#[Group('unitary')] class DatabaseAuthTest extends UnitaryTestCase { diff --git a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php b/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php index 42e396ee..9dd44d31 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php @@ -26,6 +26,7 @@ namespace SPT\Providers\Auth\Ldap; use Laminas\Ldap\Collection; use Laminas\Ldap\Ldap; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Events\Event; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class LdapActionsTest * - * @group unitary */ +#[Group('unitary')] class LdapActionsTest extends UnitaryTestCase { diff --git a/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php b/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php index 4634d0be..23034117 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php @@ -24,6 +24,7 @@ namespace SPT\Providers\Auth\Ldap; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; @@ -42,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class LdapAuthTest * - * @group unitary */ +#[Group('unitary')] class LdapAuthTest extends UnitaryTestCase { diff --git a/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php b/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php index 6e12f9c2..16eb184e 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php @@ -25,6 +25,7 @@ namespace SPT\Providers\Auth\Ldap; use Laminas\Ldap\Ldap; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\Exception; use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; @@ -40,8 +41,8 @@ use function PHPUnit\Framework\once; /** * Class LdapConnectionTest * - * @group unitary */ +#[Group('unitary')] class LdapConnectionTest extends UnitaryTestCase { private LdapConnection $ldapConnection; diff --git a/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php b/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php index 8cae569f..aec38132 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php @@ -25,6 +25,8 @@ namespace SPT\Providers\Auth\Ldap; use EmptyIterator; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Auth\Ports\LdapActionsService; use SP\Domain\Auth\Ports\LdapConnectionInterface; @@ -41,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class LdapMsAdsTest * - * @group unitary */ +#[Group('unitary')] class LdapMsAdsTest extends UnitaryTestCase { @@ -85,9 +87,9 @@ class LdapMsAdsTest extends UnitaryTestCase } /** - * @dataProvider groupDataProvider() * @throws LdapException */ + #[DataProvider('groupDataProvider')] public function testIsUserInGroup(string $group) { $this->ldapParams->setGroup($group); diff --git a/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php b/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php index 64773b16..0f4bf431 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php @@ -25,6 +25,8 @@ namespace SPT\Providers\Auth\Ldap; use EmptyIterator; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Auth\Ports\LdapActionsService; use SP\Domain\Auth\Ports\LdapConnectionInterface; @@ -41,8 +43,8 @@ use SPT\UnitaryTestCase; /** * Class LdapStdTest * - * @group unitary */ +#[Group('unitary')] class LdapStdTest extends UnitaryTestCase { @@ -85,9 +87,9 @@ class LdapStdTest extends UnitaryTestCase } /** - * @dataProvider groupDataProvider() * @throws LdapException */ + #[DataProvider('groupDataProvider')] public function testIsUserInGroup(string $group) { $this->ldapParams->setGroup($group); diff --git a/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php b/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php index 3738eb77..ed821efe 100644 --- a/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php +++ b/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php @@ -24,14 +24,16 @@ namespace SPT\Providers\Auth\Ldap; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use SP\Providers\Auth\Ldap\LdapUtil; use SPT\UnitaryTestCase; /** * Class LdapUtilTest * - * @group unitary */ +#[Group('unitary')] class LdapUtilTest extends UnitaryTestCase { @@ -59,12 +61,11 @@ class LdapUtilTest extends UnitaryTestCase } /** - * @dataProvider groupNameProvider - * * @param string $group * @param string|null $expected * @return void */ + #[DataProvider('groupNameProvider')] public function testGetGroupName(string $group, ?string $expected) { self::assertEquals($expected, LdapUtil::getGroupName($group)); diff --git a/tests/SPT/Util/ChainableTest.php b/tests/SPT/Util/ChainableTest.php index fadc00ef..7f16c355 100644 --- a/tests/SPT/Util/ChainableTest.php +++ b/tests/SPT/Util/ChainableTest.php @@ -30,8 +30,8 @@ use SP\Util\Chainable; /** * Class ChainableTest * - * @group unitary */ +#[Group('unitary')] class ChainableTest extends TestCase { public function testNext() diff --git a/tests/SPT/Util/UtilTest.php b/tests/SPT/Util/UtilTest.php index cf104d2c..6fd426ac 100644 --- a/tests/SPT/Util/UtilTest.php +++ b/tests/SPT/Util/UtilTest.php @@ -24,6 +24,7 @@ namespace SPT\Util; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use SP\Util\Util; @@ -42,6 +43,36 @@ class UtilTest extends TestCase ini_set('memory_limit', -1); } + public static function boolProvider(): array + { + return [ + ['false', false], + ['no', false], + ['n', false], + ['0', false], + ['off', false], + [0, false], + ['true', true], + ['yes', true], + ['y', true], + ['1', true], + ['on', true], + [1, true] + ]; + } + + public static function unitsProvider(): array + { + return [ + ['128K', 131072], + ['128M', 134217728], + ['128G', 137438953472], + [131072, 131072], + [134217728, 134217728], + [137438953472, 137438953472], + ]; + } + public function testCastToClass() { self::markTestIncomplete(); @@ -53,11 +84,10 @@ class UtilTest extends TestCase } /** - * @dataProvider unitsProvider - * * @param $unit * @param $expected */ + #[DataProvider('unitsProvider')] public function testConvertShortUnit($unit, $expected) { $this->assertEquals($expected, Util::convertShortUnit($unit)); @@ -80,49 +110,18 @@ class UtilTest extends TestCase } /** - * @dataProvider boolProvider - * * @param $value * @param $expected */ + #[DataProvider('boolProvider')] public function testBoolval($value, $expected) { $this->assertEquals($expected, Util::boolval($value)); $this->assertEquals($expected, Util::boolval($value, true)); } - public static function boolProvider(): array - { - return [ - ['false', false], - ['no', false], - ['n', false], - ['0', false], - ['off', false], - [0, false], - ['true', true], - ['yes', true], - ['y', true], - ['1', true], - ['on', true], - [1, true] - ]; - } - public function testGetTempDir() { self::markTestIncomplete(); } - - public static function unitsProvider(): array - { - return [ - ['128K', 131072], - ['128M', 134217728], - ['128G', 137438953472], - [131072, 131072], - [134217728, 134217728], - [137438953472, 137438953472], - ]; - } }