diff --git a/apps/comments/tests/Unit/AppInfo/ApplicationTest.php b/apps/comments/tests/Unit/AppInfo/ApplicationTest.php index 119db5333b522..ac34c97778c03 100644 --- a/apps/comments/tests/Unit/AppInfo/ApplicationTest.php +++ b/apps/comments/tests/Unit/AppInfo/ApplicationTest.php @@ -24,10 +24,9 @@ /** * Class ApplicationTest * - * @group DB - * * @package OCA\Comments\Tests\Unit\AppInfo */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ApplicationTest extends TestCase { protected function setUp(): void { parent::setUp(); diff --git a/apps/contactsinteraction/tests/Db/RecentContactMapperTest.php b/apps/contactsinteraction/tests/Db/RecentContactMapperTest.php index f5df27820d789..e3b844e663819 100644 --- a/apps/contactsinteraction/tests/Db/RecentContactMapperTest.php +++ b/apps/contactsinteraction/tests/Db/RecentContactMapperTest.php @@ -17,9 +17,7 @@ use Sabre\VObject\UUIDUtil; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RecentContactMapperTest extends TestCase { private RecentContactMapper $recentContactMapper; private ITimeFactory $time; diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index fe09c3f423fbb..a5333fbc9d908 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -211,7 +211,7 @@ public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N } if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) { - $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager); + $node = new Directory($this->fileView, $info, $this->tree, $this->shareManager); } else { // In case reading a directory was allowed but it turns out the node was a not a directory, reject it now. if (!$this->info->isReadable()) { diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index 9e9434844652b..7398af83377d5 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -92,6 +92,7 @@ use OCP\ITagManager; use OCP\IURLGenerator; use OCP\IUserSession; +use OCP\Mail\IEmailValidator; use OCP\Mail\IMailer; use OCP\Profiler\IProfiler; use OCP\SabrePluginEvent; @@ -351,7 +352,7 @@ public function __construct( \OCP\Server::get(IMipService::class), \OCP\Server::get(EventComparisonService::class), \OCP\Server::get(\OCP\Mail\Provider\IManager::class), - \OCP\Server::get(\OCP\Mail\IEmailValidator::class), + \OCP\Server::get(IEmailValidator::class), )); } $this->server->addPlugin(new \OCA\DAV\CalDAV\Search\SearchPlugin()); diff --git a/apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php b/apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php index ef60817b84cdf..c8d0b041fcdc8 100644 --- a/apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php +++ b/apps/dav/tests/integration/DAV/Sharing/CalDavSharingBackendTest.php @@ -28,9 +28,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CalDavSharingBackendTest extends TestCase { private IDBConnection $db; diff --git a/apps/dav/tests/integration/DAV/Sharing/SharingMapperTest.php b/apps/dav/tests/integration/DAV/Sharing/SharingMapperTest.php index bcf8425403407..68dec89aa3e07 100644 --- a/apps/dav/tests/integration/DAV/Sharing/SharingMapperTest.php +++ b/apps/dav/tests/integration/DAV/Sharing/SharingMapperTest.php @@ -14,9 +14,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SharingMapperTest extends TestCase { private SharingMapper $mapper; diff --git a/apps/dav/tests/integration/Db/PropertyMapperTest.php b/apps/dav/tests/integration/Db/PropertyMapperTest.php index 9bd47a82d35bf..22ddbdf3bb401 100644 --- a/apps/dav/tests/integration/Db/PropertyMapperTest.php +++ b/apps/dav/tests/integration/Db/PropertyMapperTest.php @@ -13,9 +13,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PropertyMapperTest extends TestCase { /** @var PropertyMapper */ diff --git a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php index 0682733a10380..ac28793303783 100644 --- a/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php +++ b/apps/dav/tests/integration/UserMigration/CalendarMigratorTest.php @@ -22,9 +22,7 @@ use Test\TestCase; use function scandir; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CalendarMigratorTest extends TestCase { private IUserManager $userManager; diff --git a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php index 9ae1ca285019b..bc7d42d10707a 100644 --- a/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php +++ b/apps/dav/tests/integration/UserMigration/ContactsMigratorTest.php @@ -22,9 +22,7 @@ use Test\TestCase; use function scandir; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ContactsMigratorTest extends TestCase { private IUserManager $userManager; diff --git a/apps/dav/tests/unit/AppInfo/ApplicationTest.php b/apps/dav/tests/unit/AppInfo/ApplicationTest.php index 336f487e0b832..5af3836741e3d 100644 --- a/apps/dav/tests/unit/AppInfo/ApplicationTest.php +++ b/apps/dav/tests/unit/AppInfo/ApplicationTest.php @@ -16,10 +16,10 @@ /** * Class ApplicationTest * - * @group DB * * @package OCA\DAV\Tests\Unit\AppInfo */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ApplicationTest extends TestCase { public function test(): void { $app = new Application(); diff --git a/apps/dav/tests/unit/BackgroundJob/UserStatusAutomationTest.php b/apps/dav/tests/unit/BackgroundJob/UserStatusAutomationTest.php index d49d20180d976..41e13df975bc7 100644 --- a/apps/dav/tests/unit/BackgroundJob/UserStatusAutomationTest.php +++ b/apps/dav/tests/unit/BackgroundJob/UserStatusAutomationTest.php @@ -25,9 +25,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserStatusAutomationTest extends TestCase { protected ITimeFactory&MockObject $time; protected IJobList&MockObject $jobList; diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php index 86fc6d06b3b8d..3e419e086acb0 100644 --- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php +++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php @@ -39,10 +39,10 @@ /** * Class CalDavBackendTest * - * @group DB * * @package OCA\DAV\Tests\unit\CalDAV */ +#[\PHPUnit\Framework\Attributes\Group('DB')] abstract class AbstractCalDavBackend extends TestCase { diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php index 87b55f14bccf2..ca8f5d5669f0c 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/GenericTest.php @@ -13,9 +13,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class GenericTest extends TestCase { public static function dataFilters(): array { return [ diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index f9205d5d322a7..abb0155103764 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -28,9 +28,8 @@ /** * Class CalDavBackendTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CalDavBackendTest extends AbstractCalDavBackend { public function testCalendarOperations(): void { $calendarId = $this->createTestCalendar(); diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php index 39b8427ba6dfb..ee3be9fb16ca5 100644 --- a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php +++ b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php @@ -29,10 +29,10 @@ /** * Class PublicCalendarRootTest * - * @group DB * * @package OCA\DAV\Tests\unit\CalDAV */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PublicCalendarRootTest extends TestCase { public const UNIT_TEST_USER = ''; private CalDavBackend $backend; diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php index 6b813ed022848..4bea30dbfc975 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php @@ -17,9 +17,7 @@ use OCP\AppFramework\QueryException; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class NotificationProviderManagerTest extends TestCase { private NotificationProviderManager $providerManager; diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index 4e360ed31a3b2..00ab531dc90d9 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -43,10 +43,10 @@ /** * Class CardDavBackendTest * - * @group DB * * @package OCA\DAV\Tests\unit\CardDAV */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CardDavBackendTest extends TestCase { private Principal&MockObject $principal; private IUserManager&MockObject $userManager; diff --git a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php index 7a8518ac70c6f..6caec9266368e 100644 --- a/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php +++ b/apps/dav/tests/unit/Command/RemoveInvalidSharesTest.php @@ -23,8 +23,8 @@ * Class RemoveInvalidSharesTest * * @package OCA\DAV\Tests\Unit\Repair - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RemoveInvalidSharesTest extends TestCase { private RemoveInvalidShares $command; diff --git a/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php b/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php index 8b8c775c8ecf6..2c25b32fa0291 100644 --- a/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php +++ b/apps/dav/tests/unit/Connector/LegacyPublicAuthTest.php @@ -20,10 +20,10 @@ /** * Class LegacyPublicAuthTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LegacyPublicAuthTest extends \Test\TestCase { private ISession&MockObject $session; private IRequest&MockObject $request; diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php index 4b42a81570803..cf6efea0c5b8b 100644 --- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php @@ -27,8 +27,8 @@ * Class AuthTest * * @package OCA\DAV\Tests\unit\Connector\Sabre - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AuthTest extends TestCase { private ISession&MockObject $session; private Session&MockObject $userSession; diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php index 1e6267d4cbbe9..01038747bde24 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php @@ -19,9 +19,7 @@ use Sabre\HTTP\ResponseInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BearerAuthTest extends TestCase { private IUserSession&MockObject $userSession; private ISession&MockObject $session; diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php index cafbdd3ca400f..1ffe47f70d800 100644 --- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php @@ -22,10 +22,10 @@ /** * Class CustomPropertiesBackend * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CustomPropertiesBackendTest extends \Test\TestCase { private \Sabre\DAV\Server $server; private \Sabre\DAV\Tree&MockObject $tree; diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php index 421ee1bdc1276..9ebe921d5b2dc 100644 --- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php @@ -55,9 +55,7 @@ public function getRelativePath($path): ?string { } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DirectoryTest extends \Test\TestCase { use UserTrait; diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php index 60c8382e131aa..64ee2df025379 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php @@ -46,10 +46,10 @@ /** * Class File * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FileTest extends TestCase { use MountProviderTrait; use UserTrait; diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index 4df3accfda95b..8d27bc337e4af 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -35,9 +35,7 @@ use Sabre\Xml\Service; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FilesPluginTest extends TestCase { private Tree&MockObject $tree; diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php index 11970769a1e7b..ddea281ea1d49 100644 --- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php @@ -29,9 +29,9 @@ /** * Class NodeTest * - * @group DB * @package OCA\DAV\Tests\unit\Connector\Sabre */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class NodeTest extends \Test\TestCase { public static function davPermissionsProvider(): array { return [ diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php index b07778e4fbdac..592d6c958d0f3 100644 --- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php @@ -23,10 +23,10 @@ /** * Class ObjectTreeTest * - * @group DB * * @package OCA\DAV\Tests\Unit\Connector\Sabre */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectTreeTest extends \Test\TestCase { public static function copyDataProvider(): array { return [ diff --git a/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php index 26d0ef541f2f3..7fb2339c6f426 100644 --- a/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/PublicAuthTest.php @@ -22,10 +22,10 @@ /** * Class PublicAuthTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PublicAuthTest extends \Test\TestCase { private ISession&MockObject $session; diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php index 7d3488e6b5aa8..34cc0cd5fb3ce 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DeleteTest.php @@ -14,10 +14,10 @@ /** * Class DeleteTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DeleteTest extends RequestTestCase { public function testBasicUpload(): void { $user = self::getUniqueID(); diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php index 34171963ef06d..490833b911d5d 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/DownloadTest.php @@ -14,10 +14,10 @@ /** * Class DownloadTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DownloadTest extends RequestTestCase { public function testDownload(): void { $user = self::getUniqueID(); diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php index 615490ddc9260..cf552e4d4c8fb 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionMasterKeyUploadTest.php @@ -17,10 +17,10 @@ /** * Class EncryptionMasterKeyUploadTest * - * @group DB * * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class EncryptionMasterKeyUploadTest extends UploadTest { use EncryptionTrait; diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php index efa7bb54cf890..19b2b170a9df4 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/EncryptionUploadTest.php @@ -17,10 +17,10 @@ /** * Class EncryptionUploadTest * - * @group DB * * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class EncryptionUploadTest extends UploadTest { use EncryptionTrait; diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php index e6fa489fb2418..bd22f37185807 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php @@ -14,10 +14,10 @@ /** * Class PartFileInRootUploadTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PartFileInRootUploadTest extends UploadTest { protected function setUp(): void { $config = Server::get(IConfig::class); diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php index ec28536350753..1bb1b1e42c45d 100644 --- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/UploadTest.php @@ -16,10 +16,10 @@ /** * Class UploadTest * - * @group DB * * @package OCA\DAV\Tests\unit\Connector\Sabre\RequestTest */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UploadTest extends RequestTestCase { public function testBasicUpload(): void { $user = self::getUniqueID(); diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php index 08fdf288f9c57..3e333bddabf80 100644 --- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php +++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php @@ -25,9 +25,7 @@ use Sabre\DAVACL\IPrincipal; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CustomPropertiesBackendTest extends TestCase { private const BASE_URI = '/remote.php/dav/'; diff --git a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php index 1852d2709c19d..18c4ebb020e3d 100644 --- a/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php +++ b/apps/dav/tests/unit/Migration/CalDAVRemoveEmptyValueTest.php @@ -21,8 +21,8 @@ * Class CalDAVRemoveEmptyValueTest * * @package OCA\DAV\Tests\Unit\DAV\Migration - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CalDAVRemoveEmptyValueTest extends TestCase { private LoggerInterface&MockObject $logger; private CalDavBackend&MockObject $backend; diff --git a/apps/dav/tests/unit/ServerTest.php b/apps/dav/tests/unit/ServerTest.php index 9ffe86d305319..96574643a8d81 100644 --- a/apps/dav/tests/unit/ServerTest.php +++ b/apps/dav/tests/unit/ServerTest.php @@ -14,10 +14,10 @@ /** * Class ServerTest * - * @group DB * * @package OCA\DAV\Tests\Unit */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ServerTest extends \Test\TestCase { #[\PHPUnit\Framework\Attributes\DataProvider('providesUris')] diff --git a/apps/encryption/tests/Command/FixEncryptedVersionTest.php b/apps/encryption/tests/Command/FixEncryptedVersionTest.php index 6376e7293abd9..b94d4400d5ded 100644 --- a/apps/encryption/tests/Command/FixEncryptedVersionTest.php +++ b/apps/encryption/tests/Command/FixEncryptedVersionTest.php @@ -31,9 +31,9 @@ /** * Class FixEncryptedVersionTest * - * @group DB * @package OCA\Encryption\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FixEncryptedVersionTest extends TestCase { use MountProviderTrait; use EncryptionTrait; diff --git a/apps/encryption/tests/Command/TestEnableMasterKey.php b/apps/encryption/tests/Command/TestEnableMasterKey.php index fe1d635534b3a..aec1b1de71931 100644 --- a/apps/encryption/tests/Command/TestEnableMasterKey.php +++ b/apps/encryption/tests/Command/TestEnableMasterKey.php @@ -19,6 +19,9 @@ use Test\TestCase; class TestEnableMasterKey extends TestCase { + public function __construct() { + parent::__construct(static::class); + } protected EnableMasterKey $enableMasterKey; protected Util&MockObject $util; protected IAppConfig&MockObject $config; diff --git a/apps/encryption/tests/Crypto/CryptTest.php b/apps/encryption/tests/Crypto/CryptTest.php index 1355e2c855d20..cb817687b88c3 100644 --- a/apps/encryption/tests/Crypto/CryptTest.php +++ b/apps/encryption/tests/Crypto/CryptTest.php @@ -306,9 +306,8 @@ public function testEncrypt() { /** * test decrypt() - * - * @depends testEncrypt */ + #[\PHPUnit\Framework\Attributes\Depends('testEncrypt')] public function testDecrypt($data): void { $result = self::invokePrivate( $this->crypt, diff --git a/apps/encryption/tests/EncryptedStorageTest.php b/apps/encryption/tests/EncryptedStorageTest.php index 59f419a7f7a1a..a47a71370eb60 100644 --- a/apps/encryption/tests/EncryptedStorageTest.php +++ b/apps/encryption/tests/EncryptedStorageTest.php @@ -23,9 +23,7 @@ class TemporaryNoEncrypted extends Temporary implements IDisableEncryptionStorag } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class EncryptedStorageTest extends TestCase { use MountProviderTrait; use EncryptionTrait; diff --git a/apps/encryption/tests/Listeners/UserEventsListenersTest.php b/apps/encryption/tests/Listeners/UserEventsListenersTest.php index 5c2cdb1e6ddcb..15b99c2e2067c 100644 --- a/apps/encryption/tests/Listeners/UserEventsListenersTest.php +++ b/apps/encryption/tests/Listeners/UserEventsListenersTest.php @@ -30,9 +30,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserEventsListenersTest extends TestCase { protected Util&MockObject $util; diff --git a/apps/encryption/tests/PassphraseServiceTest.php b/apps/encryption/tests/PassphraseServiceTest.php index c2dc9d8173c77..c275b6aadea08 100644 --- a/apps/encryption/tests/PassphraseServiceTest.php +++ b/apps/encryption/tests/PassphraseServiceTest.php @@ -21,9 +21,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PassphraseServiceTest extends TestCase { protected Util&MockObject $util; diff --git a/apps/encryption/tests/SessionTest.php b/apps/encryption/tests/SessionTest.php index c24855e1ac455..b12ff495bff3b 100644 --- a/apps/encryption/tests/SessionTest.php +++ b/apps/encryption/tests/SessionTest.php @@ -28,17 +28,13 @@ public function testThatGetPrivateKeyThrowsExceptionWhenNotSet(): void { $this->instance->getPrivateKey(); } - /** - * @depends testThatGetPrivateKeyThrowsExceptionWhenNotSet - */ + #[\PHPUnit\Framework\Attributes\Depends('testThatGetPrivateKeyThrowsExceptionWhenNotSet')] public function testSetAndGetPrivateKey(): void { $this->instance->setPrivateKey('dummyPrivateKey'); $this->assertEquals('dummyPrivateKey', $this->instance->getPrivateKey()); } - /** - * @depends testSetAndGetPrivateKey - */ + #[\PHPUnit\Framework\Attributes\Depends('testSetAndGetPrivateKey')] public function testIsPrivateKeySet(): void { $this->instance->setPrivateKey('dummyPrivateKey'); $this->assertTrue($this->instance->isPrivateKeySet()); diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index 81c67a29254a0..e293f440fe385 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -31,8 +31,8 @@ * Class RequestHandlerTest * * @package OCA\FederatedFileSharing\Tests - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RequestHandlerControllerTest extends \Test\TestCase { private string $owner = 'owner'; private string $user1 = 'user1'; diff --git a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php index 7e97510af224a..6ec0ca138529c 100644 --- a/apps/federatedfilesharing/tests/FederatedShareProviderTest.php +++ b/apps/federatedfilesharing/tests/FederatedShareProviderTest.php @@ -36,8 +36,8 @@ * Class FederatedShareProviderTest * * @package OCA\FederatedFileSharing\Tests - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FederatedShareProviderTest extends \Test\TestCase { protected IDBConnection $connection; protected AddressHandler&MockObject $addressHandler; diff --git a/apps/federatedfilesharing/tests/TestCase.php b/apps/federatedfilesharing/tests/TestCase.php index 499065f3b65d7..1cb1c064b9463 100644 --- a/apps/federatedfilesharing/tests/TestCase.php +++ b/apps/federatedfilesharing/tests/TestCase.php @@ -17,12 +17,9 @@ use OCP\Server; /** - * Class Test_Files_Sharing_Base - * - * @group DB - * * Base class for sharing tests. */ +#[\PHPUnit\Framework\Attributes\Group('DB')] abstract class TestCase extends \Test\TestCase { public const TEST_FILES_SHARING_API_USER1 = 'test-share-user1'; public const TEST_FILES_SHARING_API_USER2 = 'test-share-user2'; diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php index 877663b058a3e..a56539bb30c6c 100644 --- a/apps/federation/lib/DbHandler.php +++ b/apps/federation/lib/DbHandler.php @@ -20,8 +20,6 @@ * Handles all database calls for the federation app * * @todo Port to QBMapper - * - * @group DB * @package OCA\Federation */ class DbHandler { diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php index 943bdf352deeb..b847a4cfcf61a 100644 --- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php @@ -27,10 +27,10 @@ /** * Class GetSharedSecretTest * - * @group DB * * @package OCA\Federation\Tests\BackgroundJob */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class GetSharedSecretTest extends TestCase { private MockObject&IClient $httpClient; diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php index a8295ad665a14..4e9e1bd2c88d7 100644 --- a/apps/federation/tests/DbHandlerTest.php +++ b/apps/federation/tests/DbHandlerTest.php @@ -16,9 +16,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DbHandlerTest extends TestCase { private DbHandler $dbHandler; private IL10N&MockObject $il10n; diff --git a/apps/files/tests/Activity/Filter/GenericTest.php b/apps/files/tests/Activity/Filter/GenericTest.php index 40e2f9848b52a..8d8a00ededa95 100644 --- a/apps/files/tests/Activity/Filter/GenericTest.php +++ b/apps/files/tests/Activity/Filter/GenericTest.php @@ -17,8 +17,8 @@ * Class GenericTest * * @package OCA\Files\Tests\Activity\Filter - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class GenericTest extends TestCase { public static function dataFilters(): array { return [ diff --git a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php index 3f811fca40791..17fd69a332c0b 100644 --- a/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php +++ b/apps/files/tests/BackgroundJob/DeleteOrphanedItemsJobTest.php @@ -18,10 +18,10 @@ /** * Class DeleteOrphanedItemsJobTest * - * @group DB * * @package Test\BackgroundJob */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DeleteOrphanedItemsJobTest extends \Test\TestCase { protected IDBConnection $connection; protected LoggerInterface $logger; diff --git a/apps/files/tests/BackgroundJob/ScanFilesTest.php b/apps/files/tests/BackgroundJob/ScanFilesTest.php index 00d9ed823f9f3..22ec049741b2b 100644 --- a/apps/files/tests/BackgroundJob/ScanFilesTest.php +++ b/apps/files/tests/BackgroundJob/ScanFilesTest.php @@ -27,8 +27,8 @@ * Class ScanFilesTest * * @package OCA\Files\Tests\BackgroundJob - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ScanFilesTest extends TestCase { use UserTrait; use MountProviderTrait; diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index a488915e0cbea..18b484123b9f7 100644 --- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php @@ -22,10 +22,10 @@ /** * Class DeleteOrphanedFilesTest * - * @group DB * * @package OCA\Files\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DeleteOrphanedFilesTest extends TestCase { private DeleteOrphanedFiles $command; diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index ede4c7f7fa3a3..cd466b3e97ea9 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -41,10 +41,10 @@ /** * Class ViewControllerTest * - * @group RoutingWeirdness * * @package OCA\Files\Tests\Controller */ +#[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] class ViewControllerTest extends TestCase { private ContainerInterface&MockObject $container; private IAppManager&MockObject $appManager; diff --git a/apps/files/tests/Service/TagServiceTest.php b/apps/files/tests/Service/TagServiceTest.php index 424e483102c83..05a6518022512 100644 --- a/apps/files/tests/Service/TagServiceTest.php +++ b/apps/files/tests/Service/TagServiceTest.php @@ -24,10 +24,10 @@ /** * Class TagServiceTest * - * @group DB * * @package OCA\Files */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TagServiceTest extends \Test\TestCase { private string $user; private IUserSession&MockObject $userSession; diff --git a/apps/files_external/tests/Listener/StorePasswordListenerTest.php b/apps/files_external/tests/Listener/StorePasswordListenerTest.php index 04635b7dafd7d..848d8a35dac9b 100644 --- a/apps/files_external/tests/Listener/StorePasswordListenerTest.php +++ b/apps/files_external/tests/Listener/StorePasswordListenerTest.php @@ -18,9 +18,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class StorePasswordListenerTest extends TestCase { protected IUser&MockObject $mockedUser; diff --git a/apps/files_external/tests/OwnCloudFunctionsTest.php b/apps/files_external/tests/OwnCloudFunctionsTest.php index 2e052cb86b0ae..298fb7461218f 100644 --- a/apps/files_external/tests/OwnCloudFunctionsTest.php +++ b/apps/files_external/tests/OwnCloudFunctionsTest.php @@ -13,10 +13,10 @@ /** * Class OwnCloudFunctions * - * @group DB * * @package OCA\Files_External\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class OwnCloudFunctionsTest extends \Test\TestCase { public static function configUrlProvider(): array { return [ diff --git a/apps/files_external/tests/Service/DBConfigServiceTest.php b/apps/files_external/tests/Service/DBConfigServiceTest.php index 85d8b70fda710..87c01dcc85f9d 100644 --- a/apps/files_external/tests/Service/DBConfigServiceTest.php +++ b/apps/files_external/tests/Service/DBConfigServiceTest.php @@ -14,9 +14,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DBConfigServiceTest extends TestCase { private IDBConnection $connection; private DBConfigService $dbConfig; diff --git a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php index b4c8617830b1f..a76005718d37a 100644 --- a/apps/files_external/tests/Service/GlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/GlobalStoragesServiceTest.php @@ -13,9 +13,7 @@ use OCA\Files_External\Service\GlobalStoragesService; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class GlobalStoragesServiceTest extends StoragesServiceTestCase { protected function setUp(): void { parent::setUp(); diff --git a/apps/files_external/tests/Service/StoragesServiceTestCase.php b/apps/files_external/tests/Service/StoragesServiceTestCase.php index 052bc578a18b0..fdc086751af7d 100644 --- a/apps/files_external/tests/Service/StoragesServiceTestCase.php +++ b/apps/files_external/tests/Service/StoragesServiceTestCase.php @@ -53,9 +53,7 @@ public function clean() { } } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] abstract class StoragesServiceTestCase extends \Test\TestCase { protected StoragesService $service; protected BackendService&MockObject $backendService; diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php index 2119872ea5b8b..e38835f2077a1 100644 --- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest { use UserTrait; diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php index 8c7c4d1f2db3b..99482a9cbbeb1 100644 --- a/apps/files_external/tests/Service/UserStoragesServiceTest.php +++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php @@ -22,9 +22,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserStoragesServiceTest extends StoragesServiceTestCase { use UserTrait; diff --git a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php index b01f65b0b6ea3..2ba180dbbcff3 100644 --- a/apps/files_external/tests/Storage/Amazons3MultiPartTest.php +++ b/apps/files_external/tests/Storage/Amazons3MultiPartTest.php @@ -12,11 +12,11 @@ /** * Class Amazons3Test * - * @group DB - * @group S3 * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] +#[\PHPUnit\Framework\Attributes\Group('S3')] class Amazons3MultiPartTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; /** @var AmazonS3 */ diff --git a/apps/files_external/tests/Storage/Amazons3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php index 349161cde25c2..864d6be03a828 100644 --- a/apps/files_external/tests/Storage/Amazons3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -13,11 +13,11 @@ /** * Class Amazons3Test * - * @group DB - * @group S3 * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] +#[\PHPUnit\Framework\Attributes\Group('S3')] class Amazons3Test extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; /** @var AmazonS3 */ diff --git a/apps/files_external/tests/Storage/FtpTest.php b/apps/files_external/tests/Storage/FtpTest.php index 22a31d57da891..34a1393053a85 100644 --- a/apps/files_external/tests/Storage/FtpTest.php +++ b/apps/files_external/tests/Storage/FtpTest.php @@ -13,10 +13,10 @@ /** * Class FtpTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FtpTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php index 205ff8ac4a1a5..0ab66713454c2 100644 --- a/apps/files_external/tests/Storage/OwncloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -13,10 +13,10 @@ /** * Class OwnCloudTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class OwncloudTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; diff --git a/apps/files_external/tests/Storage/SFTP_KeyTest.php b/apps/files_external/tests/Storage/SFTP_KeyTest.php index 4e59685dc1303..57ffea340fad4 100644 --- a/apps/files_external/tests/Storage/SFTP_KeyTest.php +++ b/apps/files_external/tests/Storage/SFTP_KeyTest.php @@ -13,10 +13,10 @@ /** * Class SFTP_KeyTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SFTP_KeyTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; diff --git a/apps/files_external/tests/Storage/SftpTest.php b/apps/files_external/tests/Storage/SftpTest.php index 8861d5ce8604b..2842618965539 100644 --- a/apps/files_external/tests/Storage/SftpTest.php +++ b/apps/files_external/tests/Storage/SftpTest.php @@ -13,10 +13,10 @@ /** * Class SftpTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SftpTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; /** diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php index 6bb941da4f8b6..dae402a150912 100644 --- a/apps/files_external/tests/Storage/SmbTest.php +++ b/apps/files_external/tests/Storage/SmbTest.php @@ -17,10 +17,10 @@ /** * Class SmbTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SmbTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; /** diff --git a/apps/files_external/tests/Storage/SwiftTest.php b/apps/files_external/tests/Storage/SwiftTest.php index c77f098bb5de7..5f8ef462dc25d 100644 --- a/apps/files_external/tests/Storage/SwiftTest.php +++ b/apps/files_external/tests/Storage/SwiftTest.php @@ -14,10 +14,10 @@ /** * Class SwiftTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SwiftTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; diff --git a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php index 9d413620292bf..4a195e2ea5b64 100644 --- a/apps/files_external/tests/Storage/VersionedAmazonS3Test.php +++ b/apps/files_external/tests/Storage/VersionedAmazonS3Test.php @@ -8,10 +8,8 @@ namespace OCA\Files_External\Tests\Storage; -/** - * @group DB - * @group S3 - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] +#[\PHPUnit\Framework\Attributes\Group('S3')] class VersionedAmazonS3Test extends Amazons3Test { protected function setUp(): void { parent::setUp(); diff --git a/apps/files_external/tests/Storage/WebdavTest.php b/apps/files_external/tests/Storage/WebdavTest.php index 43f392b1a2580..e7abe92afab45 100644 --- a/apps/files_external/tests/Storage/WebdavTest.php +++ b/apps/files_external/tests/Storage/WebdavTest.php @@ -16,10 +16,10 @@ /** * Class WebdavTest * - * @group DB * * @package OCA\Files_External\Tests\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class WebdavTest extends \Test\Files\Storage\Storage { use ConfigurableStorageTrait; diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index 759e2011c2512..4a4d04be5c44f 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -43,12 +43,12 @@ use Psr\Log\LoggerInterface; use Test\Traits\EmailValidatorTrait; +// TODO: convert to real integration tests /** * Class ApiTest - * - * @group DB - * TODO: convert to real integration tests */ +#[\PHPUnit\Framework\Attributes\Medium] +#[\PHPUnit\Framework\Attributes\Group('DB')] class ApiTest extends TestCase { use EmailValidatorTrait; @@ -184,7 +184,6 @@ public function testCreateShareUserFolder(): void { $ocs->cleanup(); } - public function testCreateShareGroupFile(): void { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->filename, Constants::PERMISSION_ALL, IShare::TYPE_GROUP, self::TEST_FILES_SHARING_API_GROUP1); @@ -217,9 +216,7 @@ public function testCreateShareGroupFolder(): void { $ocs->cleanup(); } - /** - * @group RoutingWeirdness - */ + #[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] public function testCreateShareLink(): void { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->folder, Constants::PERMISSION_ALL, IShare::TYPE_LINK); @@ -242,10 +239,8 @@ public function testCreateShareLink(): void { $ocs->cleanup(); } - /** - * @group RoutingWeirdness - */ #[\PHPUnit\Framework\Attributes\DataProvider('dataAllowFederationOnPublicShares')] + #[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] public function testCreateShareLinkPublicUpload(array $appConfig, int $permissions): void { $this->appConfig->method('getValueBool') ->willReturnMap([$appConfig]); @@ -328,9 +323,6 @@ public function testEnforceLinkPassword(): void { $this->addToAssertionCount(1); } - /** - * @medium - */ public function testSharePermissions(): void { // sharing file to a user should work if shareapi_exclude_groups is set // to no @@ -378,10 +370,6 @@ public function testSharePermissions(): void { $this->addToAssertionCount(1); } - - /** - * @medium - */ public function testGetAllShares(): void { $node = $this->userFolder->get($this->filename); @@ -439,10 +427,7 @@ public function testGetAllSharesWithMe(): void { $this->shareManager->deleteShare($share2); } - /** - * @medium - * @group RoutingWeirdness - */ + #[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] public function testPublicLinkUrl(): void { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->createShare($this->folder, Constants::PERMISSION_ALL, IShare::TYPE_LINK); @@ -487,11 +472,8 @@ public function testPublicLinkUrl(): void { $ocs->cleanup(); } - /** - * @medium - * @depends testCreateShareUserFile - * @depends testCreateShareLink - */ + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareUserFile')] + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareLink')] public function testGetShareFromSource(): void { $node = $this->userFolder->get($this->filename); $share = $this->shareManager->newShare(); @@ -520,11 +502,8 @@ public function testGetShareFromSource(): void { $this->shareManager->deleteShare($share2); } - /** - * @medium - * @depends testCreateShareUserFile - * @depends testCreateShareLink - */ + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareUserFile')] + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareLink')] public function testGetShareFromSourceWithReshares(): void { $node = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); @@ -562,10 +541,7 @@ public function testGetShareFromSourceWithReshares(): void { $this->shareManager->deleteShare($share2); } - /** - * @medium - * @depends testCreateShareUserFile - */ + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareUserFile')] public function testGetShareFromId(): void { $node = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); @@ -587,9 +563,6 @@ public function testGetShareFromId(): void { $this->shareManager->deleteShare($share1); } - /** - * @medium - */ public function testGetShareFromFolder(): void { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); @@ -608,7 +581,6 @@ public function testGetShareFromFolder(): void { ->setPermissions(1); $share2 = $this->shareManager->createShare($share2); - $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); $result = $ocs->getShares('false', 'false', 'true', $this->folder); $ocs->cleanup(); @@ -644,7 +616,6 @@ public function testGetShareFromFolderWithFile(): void { /** * share a folder, than reshare a file within the shared folder and check if we construct the correct path - * @medium */ public function testGetShareFromFolderReshares(): void { $node1 = $this->userFolder->get($this->folder); @@ -704,7 +675,6 @@ public function testGetShareFromFolderReshares(): void { /** * reshare a sub folder and check if we get the correct path - * @medium */ public function testGetShareFromSubFolderReShares(): void { $node1 = $this->userFolder->get($this->folder . $this->subfolder); @@ -746,7 +716,6 @@ public function testGetShareFromSubFolderReShares(): void { /** * test re-re-share of folder if the path gets constructed correctly - * @medium */ public function XtestGetShareFromFolderReReShares() { $node1 = $this->userFolder->get($this->folder . $this->subfolder); @@ -823,7 +792,6 @@ public function XtestGetShareFromFolderReReShares() { /** * test multiple shared folder if the path gets constructed correctly - * @medium */ public function testGetShareMultipleSharedFolder(): void { $this->setUp(); @@ -888,7 +856,6 @@ public function testGetShareMultipleSharedFolder(): void { /** * test re-re-share of folder if the path gets constructed correctly - * @medium */ public function testGetShareFromFileReReShares(): void { $node1 = $this->userFolder->get($this->folder . $this->subfolder); @@ -942,9 +909,6 @@ public function testGetShareFromFileReReShares(): void { $this->shareManager->deleteShare($share3); } - /** - * @medium - */ public function testGetShareFromUnknownId(): void { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER3); try { @@ -956,11 +920,8 @@ public function testGetShareFromUnknownId(): void { $ocs->cleanup(); } - /** - * @medium - * @depends testCreateShareUserFile - * @depends testCreateShareLink - */ + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareUserFile')] + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareLink')] public function testUpdateShare(): void { $password = md5(time()); @@ -1018,9 +979,6 @@ public function testUpdateShare(): void { $this->shareManager->deleteShare($share2); } - /** - * @medium - */ #[\PHPUnit\Framework\Attributes\DataProvider('dataAllowFederationOnPublicShares')] public function testUpdateShareUpload(array $appConfig, int $permissions): void { $this->appConfig->method('getValueBool')->willReturnMap([ @@ -1061,9 +1019,6 @@ public static function dataAllowFederationOnPublicShares(): array { ]; } - /** - * @medium - */ public function testUpdateShareExpireDate(): void { $node1 = $this->userFolder->get($this->folder); $share1 = $this->shareManager->newShare(); @@ -1124,7 +1079,6 @@ public function testUpdateShareExpireDate(): void { $share1 = $this->shareManager->getShareById($share1->getFullId()); - // date shouldn't be changed $this->assertEquals($dateWithinRange, $share1->getExpirationDate()); // cleanup @@ -1133,10 +1087,7 @@ public function testUpdateShareExpireDate(): void { $this->shareManager->deleteShare($share1); } - /** - * @medium - * @depends testCreateShareUserFile - */ + #[\PHPUnit\Framework\Attributes\Depends('testCreateShareUserFile')] public function testDeleteShare(): void { $node1 = $this->userFolder->get($this->filename); $share1 = $this->shareManager->newShare(); @@ -1323,10 +1274,9 @@ public static function datesProvider() { /** * Make sure only ISO 8601 dates are accepted - * - * @group RoutingWeirdness */ #[\PHPUnit\Framework\Attributes\DataProvider('datesProvider')] + #[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] public function testPublicLinkExpireDate($date, $valid): void { $ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1); @@ -1356,9 +1306,7 @@ public function testPublicLinkExpireDate($date, $valid): void { $this->shareManager->deleteShare($share); } - /** - * @group RoutingWeirdness - */ + #[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] public function testCreatePublicLinkExpireDateValid(): void { $config = Server::get(IConfig::class); diff --git a/apps/files_sharing/tests/CacheTest.php b/apps/files_sharing/tests/CacheTest.php index e95d3d4f91a67..d451a9c20619e 100644 --- a/apps/files_sharing/tests/CacheTest.php +++ b/apps/files_sharing/tests/CacheTest.php @@ -22,9 +22,8 @@ /** * Class CacheTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CacheTest extends TestCase { /** diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php index 644cde444bd32..914be0702c318 100644 --- a/apps/files_sharing/tests/CapabilitiesTest.php +++ b/apps/files_sharing/tests/CapabilitiesTest.php @@ -31,9 +31,8 @@ /** * Class CapabilitiesTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CapabilitiesTest extends \Test\TestCase { /** diff --git a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php index 6f0960bf46cfb..d9c832a31851e 100644 --- a/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php +++ b/apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php @@ -20,10 +20,10 @@ /** * Class CleanupRemoteStoragesTest * - * @group DB * * @package OCA\Files_Sharing\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CleanupRemoteStoragesTest extends TestCase { protected IDBConnection $connection; diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 34f06e1bcecbc..30a946c7847b9 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -63,8 +63,8 @@ * Class ShareAPIControllerTest * * @package OCA\Files_Sharing\Tests\Controller - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareAPIControllerTest extends TestCase { use EmailValidatorTrait; diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php index 28d2622667304..a8381e70fd7ab 100644 --- a/apps/files_sharing/tests/Controller/ShareControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php @@ -50,10 +50,9 @@ use PHPUnit\Framework\MockObject\MockObject; /** - * @group DB - * * @package OCA\Files_Sharing\Controllers */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareControllerTest extends \Test\TestCase { private string $user; diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php index 18e1bf0347b2d..dcf0fcb962fd4 100644 --- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php @@ -23,10 +23,10 @@ /** * Class ShareesTest * - * @group DB * * @package OCA\Files_Sharing\Tests\API */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareesAPIControllerTest extends TestCase { /** @var ShareesAPIController */ protected $sharees; diff --git a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php index c245d157151e5..820c5e107f147 100644 --- a/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php +++ b/apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php @@ -20,10 +20,10 @@ /** * Class DeleteOrphanedSharesJobTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DeleteOrphanedSharesJobTest extends \Test\TestCase { /** * @var bool diff --git a/apps/files_sharing/tests/EncryptedSizePropagationTest.php b/apps/files_sharing/tests/EncryptedSizePropagationTest.php index 1be17df395702..284fe61721219 100644 --- a/apps/files_sharing/tests/EncryptedSizePropagationTest.php +++ b/apps/files_sharing/tests/EncryptedSizePropagationTest.php @@ -12,9 +12,7 @@ use OCP\Server; use Test\Traits\EncryptionTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class EncryptedSizePropagationTest extends SizePropagationTest { use EncryptionTrait; diff --git a/apps/files_sharing/tests/EtagPropagationTest.php b/apps/files_sharing/tests/EtagPropagationTest.php index d8580ea92d506..11350082ca0f2 100644 --- a/apps/files_sharing/tests/EtagPropagationTest.php +++ b/apps/files_sharing/tests/EtagPropagationTest.php @@ -17,10 +17,10 @@ /** * Class EtagPropagationTest * - * @group SLOWDB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('SLOWDB')] class EtagPropagationTest extends PropagationTestCase { /** diff --git a/apps/files_sharing/tests/ExpireSharesJobTest.php b/apps/files_sharing/tests/ExpireSharesJobTest.php index 6a79d13200781..e6db24241769b 100644 --- a/apps/files_sharing/tests/ExpireSharesJobTest.php +++ b/apps/files_sharing/tests/ExpireSharesJobTest.php @@ -20,10 +20,10 @@ /** * Class ExpireSharesJobTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpireSharesJobTest extends \Test\TestCase { /** @var ExpireSharesJob */ diff --git a/apps/files_sharing/tests/External/CacheTest.php b/apps/files_sharing/tests/External/CacheTest.php index 39e2057a24c7a..c23101ea49ef1 100644 --- a/apps/files_sharing/tests/External/CacheTest.php +++ b/apps/files_sharing/tests/External/CacheTest.php @@ -22,10 +22,10 @@ /** * Class Cache * - * @group DB * * @package OCA\Files_Sharing\Tests\External */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CacheTest extends TestCase { /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $contactsManager; diff --git a/apps/files_sharing/tests/External/ManagerTest.php b/apps/files_sharing/tests/External/ManagerTest.php index 06c09fd54221f..e1c40b18865b6 100644 --- a/apps/files_sharing/tests/External/ManagerTest.php +++ b/apps/files_sharing/tests/External/ManagerTest.php @@ -41,10 +41,10 @@ /** * Class ManagerTest * - * @group DB * * @package OCA\Files_Sharing\Tests\External */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends TestCase { use UserTrait; diff --git a/apps/files_sharing/tests/External/ScannerTest.php b/apps/files_sharing/tests/External/ScannerTest.php index 8b44d47f2b1aa..e7d1375539477 100644 --- a/apps/files_sharing/tests/External/ScannerTest.php +++ b/apps/files_sharing/tests/External/ScannerTest.php @@ -12,9 +12,7 @@ use OCA\Files_Sharing\External\Storage; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ScannerTest extends TestCase { protected Scanner $scanner; /** @var Storage|\PHPUnit\Framework\MockObject\MockObject */ diff --git a/apps/files_sharing/tests/ExternalStorageTest.php b/apps/files_sharing/tests/ExternalStorageTest.php index 1d9d2eed7bd2c..84013e3cb2126 100644 --- a/apps/files_sharing/tests/ExternalStorageTest.php +++ b/apps/files_sharing/tests/ExternalStorageTest.php @@ -16,9 +16,8 @@ /** * Tests for the external Storage class for remote shares. - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExternalStorageTest extends \Test\TestCase { public static function optionsProvider() { return [ diff --git a/apps/files_sharing/tests/GroupEtagPropagationTest.php b/apps/files_sharing/tests/GroupEtagPropagationTest.php index da9c7c6bd0771..2a499ac8a4f2c 100644 --- a/apps/files_sharing/tests/GroupEtagPropagationTest.php +++ b/apps/files_sharing/tests/GroupEtagPropagationTest.php @@ -13,10 +13,9 @@ use OCP\Share\IShare; /** - * @group SLOWDB - * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('SLOWDB')] class GroupEtagPropagationTest extends PropagationTestCase { /** * "user1" creates /test, /test/sub and shares with group1 diff --git a/apps/files_sharing/tests/HelperTest.php b/apps/files_sharing/tests/HelperTest.php index 4d0d747b3e4df..6df3d07bbf470 100644 --- a/apps/files_sharing/tests/HelperTest.php +++ b/apps/files_sharing/tests/HelperTest.php @@ -14,9 +14,8 @@ /** * Class HelperTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HelperTest extends TestCase { /** diff --git a/apps/files_sharing/tests/LockingTest.php b/apps/files_sharing/tests/LockingTest.php index 280c364a1367b..f691d2ddfaeb9 100644 --- a/apps/files_sharing/tests/LockingTest.php +++ b/apps/files_sharing/tests/LockingTest.php @@ -19,10 +19,10 @@ /** * Class LockingTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LockingTest extends TestCase { /** * @var \Test\Util\User\Dummy diff --git a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php index 5b5c906f1446c..120b0318e5801 100644 --- a/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php +++ b/apps/files_sharing/tests/Migration/SetPasswordColumnTest.php @@ -17,9 +17,8 @@ /** * Class SetPasswordColumnTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SetPasswordColumnTest extends TestCase { /** @var IDBConnection */ diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php index e043a1cb1efc3..5a5ebae10a744 100644 --- a/apps/files_sharing/tests/MountProviderTest.php +++ b/apps/files_sharing/tests/MountProviderTest.php @@ -25,9 +25,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Psr\Log\LoggerInterface; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MountProviderTest extends \Test\TestCase { protected MountProvider $provider; diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index 737ad6dcb4e24..472d9ecaa9107 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -19,9 +19,8 @@ /** * Class ShareTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareTest extends TestCase { public const TEST_FOLDER_NAME = '/folder_share_api_test'; diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php index cc9c70a241fe1..bfc0016d31800 100644 --- a/apps/files_sharing/tests/SharedMountTest.php +++ b/apps/files_sharing/tests/SharedMountTest.php @@ -22,9 +22,8 @@ /** * Class SharedMountTest - * - * @group SLOWDB */ +#[\PHPUnit\Framework\Attributes\Group('SLOWDB')] class SharedMountTest extends TestCase { /** @var IGroupManager */ @@ -101,9 +100,6 @@ public function testShareMountLoseParentFolder(): void { $this->view->unlink($this->folder); } - /** - * @medium - */ public function testDeleteParentOfMountPoint(): void { // share to user $share = $this->share( diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php index 1c1f0a7b71db9..f437238e6d904 100644 --- a/apps/files_sharing/tests/SharedStorageTest.php +++ b/apps/files_sharing/tests/SharedStorageTest.php @@ -25,9 +25,8 @@ /** * Class SharedStorageTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SharedStorageTest extends TestCase { protected function setUp(): void { parent::setUp(); @@ -63,8 +62,6 @@ protected function tearDown(): void { /** * if the parent of the mount point is gone then the mount point should move up - * - * @medium */ public function testParentOfMountPointIsGone(): void { @@ -108,9 +105,6 @@ public function testParentOfMountPointIsGone(): void { $this->view->unlink($this->folder); } - /** - * @medium - */ public function testRenamePartFile(): void { // share to user diff --git a/apps/files_sharing/tests/SharesReminderJobTest.php b/apps/files_sharing/tests/SharesReminderJobTest.php index ce468e279ecc1..dcf2fb1fae175 100644 --- a/apps/files_sharing/tests/SharesReminderJobTest.php +++ b/apps/files_sharing/tests/SharesReminderJobTest.php @@ -29,10 +29,10 @@ /** * Class SharesReminderJobTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SharesReminderJobTest extends \Test\TestCase { private SharesReminderJob $job; private IDBConnection $db; diff --git a/apps/files_sharing/tests/SizePropagationTest.php b/apps/files_sharing/tests/SizePropagationTest.php index e1b67abca904f..58429b2339435 100644 --- a/apps/files_sharing/tests/SizePropagationTest.php +++ b/apps/files_sharing/tests/SizePropagationTest.php @@ -17,10 +17,10 @@ /** * Class SizePropagationTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SizePropagationTest extends TestCase { use UserTrait; diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php index 0d2022ed341c0..0e466e4aff24e 100644 --- a/apps/files_sharing/tests/TestCase.php +++ b/apps/files_sharing/tests/TestCase.php @@ -27,12 +27,9 @@ use Test\Traits\MountProviderTrait; /** - * Class TestCase - * - * @group DB - * * Base class for sharing tests. */ +#[\PHPUnit\Framework\Attributes\Group('DB')] abstract class TestCase extends \Test\TestCase { use MountProviderTrait; diff --git a/apps/files_sharing/tests/UnshareChildrenTest.php b/apps/files_sharing/tests/UnshareChildrenTest.php index ac870212c99e7..cabb3812c0257 100644 --- a/apps/files_sharing/tests/UnshareChildrenTest.php +++ b/apps/files_sharing/tests/UnshareChildrenTest.php @@ -15,10 +15,10 @@ /** * Class UnshareChildrenTest * - * @group DB * * @package OCA\Files_Sharing\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UnshareChildrenTest extends TestCase { protected $subsubfolder; @@ -55,9 +55,6 @@ protected function tearDown(): void { parent::tearDown(); } - /** - * @medium - */ public function testUnshareChildren(): void { $fileInfo2 = Filesystem::getFileInfo($this->folder); diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php index 23044e0b2f32c..c6eb0018842c2 100644 --- a/apps/files_sharing/tests/UpdaterTest.php +++ b/apps/files_sharing/tests/UpdaterTest.php @@ -21,9 +21,8 @@ /** * Class UpdaterTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UpdaterTest extends TestCase { public const TEST_FOLDER_NAME = '/folder_share_updater_test'; diff --git a/apps/files_sharing/tests/WatcherTest.php b/apps/files_sharing/tests/WatcherTest.php index 1567683691577..6b08b1e2371b1 100644 --- a/apps/files_sharing/tests/WatcherTest.php +++ b/apps/files_sharing/tests/WatcherTest.php @@ -15,9 +15,8 @@ /** * Class WatcherTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class WatcherTest extends TestCase { /** @var Storage */ diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php index 41ed0e1e960d8..b8c98110da9be 100644 --- a/apps/files_trashbin/tests/Command/CleanUpTest.php +++ b/apps/files_trashbin/tests/Command/CleanUpTest.php @@ -24,10 +24,10 @@ /** * Class CleanUpTest * - * @group DB * * @package OCA\Files_Trashbin\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CleanUpTest extends TestCase { protected IUserManager&MockObject $userManager; protected IRootFolder&MockObject $rootFolder; diff --git a/apps/files_trashbin/tests/Command/ExpireTest.php b/apps/files_trashbin/tests/Command/ExpireTest.php index 5a66dac8c6ecf..69804babcf5aa 100644 --- a/apps/files_trashbin/tests/Command/ExpireTest.php +++ b/apps/files_trashbin/tests/Command/ExpireTest.php @@ -14,10 +14,10 @@ /** * Class ExpireTest * - * @group DB * * @package OCA\Files_Trashbin\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpireTest extends TestCase { public function testExpireNonExistingUser(): void { $command = new Expire('test'); diff --git a/apps/files_trashbin/tests/Command/ExpireTrashTest.php b/apps/files_trashbin/tests/Command/ExpireTrashTest.php index edad8bfbd957b..37d90bcccd9e3 100644 --- a/apps/files_trashbin/tests/Command/ExpireTrashTest.php +++ b/apps/files_trashbin/tests/Command/ExpireTrashTest.php @@ -24,10 +24,10 @@ /** * Class ExpireTrashTest * - * @group DB * * @package OCA\Files_Trashbin\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpireTrashTest extends TestCase { private Expiration $expiration; private Node $userFolder; diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index c58ddec97ddb1..3b8441a412443 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -46,10 +46,10 @@ public function moveFromStorage(IStorage $sourceStorage, string $sourceInternalP /** * Class Storage * - * @group DB * * @package OCA\Files_Trashbin\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class StorageTest extends \Test\TestCase { use MountProviderTrait; diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php index 8dcd276955867..21c8bdb92f5a0 100644 --- a/apps/files_trashbin/tests/TrashbinTest.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -33,9 +33,8 @@ /** * Class Test_Encryption - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TrashbinTest extends \Test\TestCase { public const TEST_TRASHBIN_USER1 = 'test-trashbin-user1'; public const TEST_TRASHBIN_USER2 = 'test-trashbin-user2'; diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php index dd6665f5aefbc..99b17bc2981bf 100644 --- a/apps/files_versions/tests/Command/CleanupTest.php +++ b/apps/files_versions/tests/Command/CleanupTest.php @@ -22,10 +22,10 @@ /** * Class CleanupTest * - * @group DB * * @package OCA\Files_Versions\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CleanupTest extends TestCase { protected Manager&MockObject $userManager; protected IRootFolder&MockObject $rootFolder; diff --git a/apps/files_versions/tests/Command/ExpireTest.php b/apps/files_versions/tests/Command/ExpireTest.php index b74457a7fd68a..9320e3e873f28 100644 --- a/apps/files_versions/tests/Command/ExpireTest.php +++ b/apps/files_versions/tests/Command/ExpireTest.php @@ -14,10 +14,10 @@ /** * Class ExpireTest * - * @group DB * * @package OCA\Files_Versions\Tests\Command */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpireTest extends TestCase { public function testExpireNonExistingUser(): void { $command = new Expire($this->getUniqueID('test'), ''); diff --git a/apps/files_versions/tests/StorageTest.php b/apps/files_versions/tests/StorageTest.php index 443cff3ee0658..596271c6edf5b 100644 --- a/apps/files_versions/tests/StorageTest.php +++ b/apps/files_versions/tests/StorageTest.php @@ -16,9 +16,7 @@ use Test\TestCase; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class StorageTest extends TestCase { use UserTrait; diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index c9f7d27d7ab43..0783032863e16 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -34,9 +34,8 @@ /** * Class Test_Files_versions * this class provide basic files versions test - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class VersioningTest extends \Test\TestCase { public const TEST_VERSIONS_USER = 'test-versions-user'; public const TEST_VERSIONS_USER2 = 'test-versions-user2'; @@ -138,7 +137,6 @@ protected function tearDown(): void { } /** - * @medium * test expire logic */ #[\PHPUnit\Framework\Attributes\DataProvider('versionsProvider')] diff --git a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php index 04ac0bfbd283f..bbcbe44909fd6 100644 --- a/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php +++ b/apps/oauth2/tests/Controller/LoginRedirectorControllerTest.php @@ -23,9 +23,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LoginRedirectorControllerTest extends TestCase { private IRequest&MockObject $request; private IURLGenerator&MockObject $urlGenerator; diff --git a/apps/oauth2/tests/Controller/SettingsControllerTest.php b/apps/oauth2/tests/Controller/SettingsControllerTest.php index 030a220e3d784..19498b1645432 100644 --- a/apps/oauth2/tests/Controller/SettingsControllerTest.php +++ b/apps/oauth2/tests/Controller/SettingsControllerTest.php @@ -22,9 +22,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SettingsControllerTest extends TestCase { /** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */ private $request; diff --git a/apps/oauth2/tests/Db/AccessTokenMapperTest.php b/apps/oauth2/tests/Db/AccessTokenMapperTest.php index 41a79fe725b65..f99d12e971a1e 100644 --- a/apps/oauth2/tests/Db/AccessTokenMapperTest.php +++ b/apps/oauth2/tests/Db/AccessTokenMapperTest.php @@ -14,9 +14,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AccessTokenMapperTest extends TestCase { /** @var AccessTokenMapper */ private $accessTokenMapper; diff --git a/apps/oauth2/tests/Db/ClientMapperTest.php b/apps/oauth2/tests/Db/ClientMapperTest.php index cf072118ae236..2f0b220cb755e 100644 --- a/apps/oauth2/tests/Db/ClientMapperTest.php +++ b/apps/oauth2/tests/Db/ClientMapperTest.php @@ -13,9 +13,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ClientMapperTest extends TestCase { /** @var ClientMapper */ private $clientMapper; diff --git a/apps/provisioning_api/tests/CapabilitiesTest.php b/apps/provisioning_api/tests/CapabilitiesTest.php index 86d2bb8c4fa39..43d22a7123251 100644 --- a/apps/provisioning_api/tests/CapabilitiesTest.php +++ b/apps/provisioning_api/tests/CapabilitiesTest.php @@ -19,8 +19,8 @@ * Note: group DB needed because of usage of overwriteService() * * @package OCA\Provisioning_API\Tests - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CapabilitiesTest extends TestCase { protected IAppManager&MockObject $appManager; diff --git a/apps/provisioning_api/tests/Controller/AppsControllerTest.php b/apps/provisioning_api/tests/Controller/AppsControllerTest.php index f95daeae7d381..6fc38311037b4 100644 --- a/apps/provisioning_api/tests/Controller/AppsControllerTest.php +++ b/apps/provisioning_api/tests/Controller/AppsControllerTest.php @@ -22,10 +22,10 @@ /** * Class AppsTest * - * @group DB * * @package OCA\Provisioning_API\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppsControllerTest extends TestCase { private IAppManager $appManager; private IAppConfig&MockObject $appConfig; diff --git a/apps/settings/tests/AppInfo/ApplicationTest.php b/apps/settings/tests/AppInfo/ApplicationTest.php index 3e895d87b06a3..f016c7a86a8ac 100644 --- a/apps/settings/tests/AppInfo/ApplicationTest.php +++ b/apps/settings/tests/AppInfo/ApplicationTest.php @@ -25,8 +25,8 @@ * Class ApplicationTest * * @package Tests\Settings - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ApplicationTest extends TestCase { protected Application $app; protected IAppContainer $container; diff --git a/apps/settings/tests/Controller/AdminSettingsControllerTest.php b/apps/settings/tests/Controller/AdminSettingsControllerTest.php index fbdc506457b89..775f19707c703 100644 --- a/apps/settings/tests/Controller/AdminSettingsControllerTest.php +++ b/apps/settings/tests/Controller/AdminSettingsControllerTest.php @@ -26,10 +26,10 @@ /** * Class AdminSettingsControllerTest * - * @group DB * * @package Tests\Settings\Controller */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AdminSettingsControllerTest extends TestCase { private IRequest&MockObject $request; diff --git a/apps/settings/tests/Controller/AppSettingsControllerTest.php b/apps/settings/tests/Controller/AppSettingsControllerTest.php index 392bb7b561d17..de96a10d31ee9 100644 --- a/apps/settings/tests/Controller/AppSettingsControllerTest.php +++ b/apps/settings/tests/Controller/AppSettingsControllerTest.php @@ -34,9 +34,8 @@ * Class AppSettingsControllerTest * * @package Tests\Settings\Controller - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppSettingsControllerTest extends TestCase { private IRequest&MockObject $request; private IL10N&MockObject $l10n; diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php index 2eaedf5d4ffbf..1582fe3f371df 100644 --- a/apps/settings/tests/Controller/CheckSetupControllerTest.php +++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php @@ -25,9 +25,9 @@ /** * Class CheckSetupControllerTest * - * @backupStaticAttributes * @package Tests\Settings\Controller */ +#[\PHPUnit\Framework\Attributes\BackupStaticProperties(true)] class CheckSetupControllerTest extends TestCase { private IRequest&MockObject $request; private IConfig&MockObject $config; diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php index 1012557bfc4e1..662589d3d4577 100644 --- a/apps/settings/tests/Controller/UsersControllerTest.php +++ b/apps/settings/tests/Controller/UsersControllerTest.php @@ -37,10 +37,9 @@ use PHPUnit\Framework\MockObject\MockObject; /** - * @group DB - * * @package Tests\Settings\Controller */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UsersControllerTest extends \Test\TestCase { private IGroupManager&MockObject $groupManager; private UserManager&MockObject $userManager; diff --git a/apps/settings/tests/Settings/Admin/ServerTest.php b/apps/settings/tests/Settings/Admin/ServerTest.php index e2ca4cff3c683..81ca77bd6a488 100644 --- a/apps/settings/tests/Settings/Admin/ServerTest.php +++ b/apps/settings/tests/Settings/Admin/ServerTest.php @@ -21,9 +21,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ServerTest extends TestCase { private IDBConnection $connection; private Server&MockObject $admin; diff --git a/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php b/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php index 6c75df47aa01a..dc16d044dc1c4 100644 --- a/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php +++ b/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php @@ -16,9 +16,7 @@ use OCP\SetupCheck\SetupResult; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SupportedDatabaseTest extends TestCase { private IL10N $l10n; private IUrlGenerator $urlGenerator; diff --git a/apps/settings/tests/UserMigration/AccountMigratorTest.php b/apps/settings/tests/UserMigration/AccountMigratorTest.php index b8f8301f777e7..162eeef526fdd 100644 --- a/apps/settings/tests/UserMigration/AccountMigratorTest.php +++ b/apps/settings/tests/UserMigration/AccountMigratorTest.php @@ -23,9 +23,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AccountMigratorTest extends TestCase { private IUserManager $userManager; private IAvatarManager $avatarManager; diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index be72e9e2df9b3..68e7e8691fa22 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -47,8 +47,8 @@ * Class ShareByMailProviderTest * * @package OCA\ShareByMail\Tests - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareByMailProviderTest extends TestCase { use EmailValidatorTrait; diff --git a/apps/theming/tests/Migration/Version2006Date20240905111627Test.php b/apps/theming/tests/Migration/Version2006Date20240905111627Test.php index 5f7458db11a05..430b0b45e24e0 100644 --- a/apps/theming/tests/Migration/Version2006Date20240905111627Test.php +++ b/apps/theming/tests/Migration/Version2006Date20240905111627Test.php @@ -20,9 +20,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class Version2006Date20240905111627Test extends TestCase { private IAppConfig&MockObject $appConfig; @@ -75,9 +73,7 @@ public function testRestoreSystemColors(): void { ], $setValueCalls); } - /** - * @group DB - */ + #[\PHPUnit\Framework\Attributes\Group('DB')] public function testRestoreUserColors(): void { $this->appConfig->expects(self::once()) ->method('getValueString') @@ -126,8 +122,8 @@ public function testRestoreUserColors(): void { /** * Ensure only users with background color but no primary color are migrated - * @group DB */ + #[\PHPUnit\Framework\Attributes\Group('DB')] public function testRestoreUserColorsWithConflicts(): void { $this->appConfig->expects(self::once()) ->method('getValueString') diff --git a/apps/theming/tests/ServicesTest.php b/apps/theming/tests/ServicesTest.php index 3971c9b66986a..7bacd43cf08a8 100644 --- a/apps/theming/tests/ServicesTest.php +++ b/apps/theming/tests/ServicesTest.php @@ -24,9 +24,9 @@ /** * Class ServicesTest * - * @group DB * @package OCA\Theming\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ServicesTest extends TestCase { protected App $app; diff --git a/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php index 79006887a6266..b0c5be0f9c662 100644 --- a/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php +++ b/apps/twofactor_backupcodes/tests/Db/BackupCodeMapperTest.php @@ -15,9 +15,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BackupCodeMapperTest extends TestCase { private IDBConnection $db; private BackupCodeMapper $mapper; diff --git a/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php index cfc35e7cb1cbf..afba7d6d985f7 100644 --- a/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php +++ b/apps/twofactor_backupcodes/tests/Service/BackupCodeStorageTest.php @@ -16,9 +16,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BackupCodeStorageTest extends TestCase { private IManager&MockObject $notificationManager; private string $testUID = 'test123456789'; diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 54be29d0f8643..5bda7b8086bb8 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -37,10 +37,10 @@ /** * Class AccessTest * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AccessTest extends TestCase { protected UserMapping&MockObject $userMapper; protected IManager&MockObject $shareManager; diff --git a/apps/user_ldap/tests/ConnectionTest.php b/apps/user_ldap/tests/ConnectionTest.php index 7116e15898ffa..ad99636f62c38 100644 --- a/apps/user_ldap/tests/ConnectionTest.php +++ b/apps/user_ldap/tests/ConnectionTest.php @@ -16,10 +16,10 @@ /** * Class Test_Connection * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ConnectionTest extends \Test\TestCase { protected ILDAPWrapper&MockObject $ldap; protected Connection $connection; diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 1018211176851..28c37ec605368 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -30,10 +30,10 @@ /** * Class GroupLDAPTest * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class Group_LDAPTest extends TestCase { private Access&MockObject $access; private GroupPluginManager&MockObject $pluginManager; diff --git a/apps/user_ldap/tests/HelperTest.php b/apps/user_ldap/tests/HelperTest.php index adea600d90062..86df86da2e4f7 100644 --- a/apps/user_ldap/tests/HelperTest.php +++ b/apps/user_ldap/tests/HelperTest.php @@ -13,9 +13,7 @@ use OCP\Server; use PHPUnit\Framework\MockObject\MockObject; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HelperTest extends \Test\TestCase { private IAppConfig&MockObject $appConfig; diff --git a/apps/user_ldap/tests/Jobs/SyncTest.php b/apps/user_ldap/tests/Jobs/SyncTest.php index f6ecf984ab0f0..0e46685375c88 100644 --- a/apps/user_ldap/tests/Jobs/SyncTest.php +++ b/apps/user_ldap/tests/Jobs/SyncTest.php @@ -27,9 +27,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SyncTest extends TestCase { protected Helper&MockObject $helper; protected LDAP&MockObject $ldapWrapper; diff --git a/apps/user_ldap/tests/LDAPProviderTest.php b/apps/user_ldap/tests/LDAPProviderTest.php index 57323e374aa6b..5548f47d4455d 100644 --- a/apps/user_ldap/tests/LDAPProviderTest.php +++ b/apps/user_ldap/tests/LDAPProviderTest.php @@ -28,10 +28,10 @@ /** * Class LDAPProviderTest * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LDAPProviderTest extends \Test\TestCase { private function getServerMock(IUserLDAP $userBackend, IGroupLDAP $groupBackend) { $server = $this->getMockBuilder('OC\Server') diff --git a/apps/user_ldap/tests/Mapping/GroupMappingTest.php b/apps/user_ldap/tests/Mapping/GroupMappingTest.php index df64149577f95..efa1c11f48275 100644 --- a/apps/user_ldap/tests/Mapping/GroupMappingTest.php +++ b/apps/user_ldap/tests/Mapping/GroupMappingTest.php @@ -16,10 +16,10 @@ /** * Class GroupMappingTest * - * @group DB * * @package OCA\User_LDAP\Tests\Mapping */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class GroupMappingTest extends AbstractMappingTestCase { public function getMapper(IDBConnection $dbMock, ICacheFactory $cacheFactory, IAppConfig $appConfig): GroupMapping { return new GroupMapping($dbMock, $cacheFactory, $appConfig, true); diff --git a/apps/user_ldap/tests/Mapping/UserMappingTest.php b/apps/user_ldap/tests/Mapping/UserMappingTest.php index c79a5fa77e9bc..5fc57e44c7bc0 100644 --- a/apps/user_ldap/tests/Mapping/UserMappingTest.php +++ b/apps/user_ldap/tests/Mapping/UserMappingTest.php @@ -17,10 +17,10 @@ /** * Class UserMappingTest * - * @group DB * * @package OCA\User_LDAP\Tests\Mapping */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserMappingTest extends AbstractMappingTestCase { public function getMapper(IDBConnection $dbMock, ICacheFactory $cacheFactory, IAppConfig $appConfig): UserMapping { return new UserMapping($dbMock, $cacheFactory, $appConfig, true, $this->createMock(IAssertion::class)); diff --git a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php index 89d880f4acbed..9ba54d046af76 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixGroupTest.php @@ -15,8 +15,8 @@ * Class UUIDFixGroupTest * * @package OCA\Group_LDAP\Tests\Migration - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UUIDFixGroupTest extends AbstractUUIDFixTestCase { protected function setUp(): void { $this->isUser = false; diff --git a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php index a582fd677fa6f..0c0db000953d9 100644 --- a/apps/user_ldap/tests/Migration/UUIDFixUserTest.php +++ b/apps/user_ldap/tests/Migration/UUIDFixUserTest.php @@ -15,8 +15,8 @@ * Class UUIDFixUserTest * * @package OCA\User_LDAP\Tests\Migration - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UUIDFixUserTest extends AbstractUUIDFixTestCase { protected function setUp(): void { $this->isUser = true; diff --git a/apps/user_ldap/tests/Settings/AdminTest.php b/apps/user_ldap/tests/Settings/AdminTest.php index eb6d4baa26ebf..8107849146183 100644 --- a/apps/user_ldap/tests/Settings/AdminTest.php +++ b/apps/user_ldap/tests/Settings/AdminTest.php @@ -18,9 +18,9 @@ use Test\TestCase; /** - * @group DB * @package OCA\User_LDAP\Tests\Settings */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AdminTest extends TestCase { private IL10N&MockObject $l10n; private ITemplateManager $templateManager; diff --git a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php index b245e52fe6e23..96a8913195ced 100644 --- a/apps/user_ldap/tests/User/DeletedUsersIndexTest.php +++ b/apps/user_ldap/tests/User/DeletedUsersIndexTest.php @@ -18,10 +18,10 @@ /** * Class DeletedUsersIndexTest * - * @group DB * * @package OCA\User_LDAP\Tests\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DeletedUsersIndexTest extends \Test\TestCase { protected DeletedUsersIndex $dui; protected IConfig $config; diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php index bf9d1f5746f94..a8ce9cb3120df 100644 --- a/apps/user_ldap/tests/User/ManagerTest.php +++ b/apps/user_ldap/tests/User/ManagerTest.php @@ -26,10 +26,10 @@ /** * Class Test_User_Manager * - * @group DB * * @package OCA\User_LDAP\Tests\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends \Test\TestCase { protected Access&MockObject $access; protected IConfig&MockObject $config; diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 00edd8b3f9be0..737ab5f6a86a9 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -27,10 +27,10 @@ /** * Class UserTest * - * @group DB * * @package OCA\User_LDAP\Tests\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserTest extends \Test\TestCase { protected Access&MockObject $access; protected Connection&MockObject $connection; diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index f8900c3cca467..ae9d5f75f30f5 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -19,7 +19,6 @@ use OCA\User_LDAP\User\OfflineUser; use OCA\User_LDAP\User\User; use OCA\User_LDAP\User_LDAP; -use OCA\User_LDAP\User_LDAP as UserLDAP; use OCA\User_LDAP\UserPluginManager; use OCP\HintException; use OCP\IConfig; @@ -35,10 +34,10 @@ /** * Class Test_User_Ldap_Direct * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class User_LDAPTest extends TestCase { protected Access&MockObject $access; protected OfflineUser&MockObject $offlineUser; @@ -178,7 +177,7 @@ public function testCheckPasswordUidReturn(): void { ->method('get') ->willReturn($user); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); @@ -188,7 +187,7 @@ public function testCheckPasswordUidReturn(): void { public function testCheckPasswordWrongPassword(): void { $this->prepareAccessForCheckPassword(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $backend->checkPassword('roland', 'wrong'); @@ -197,7 +196,7 @@ public function testCheckPasswordWrongPassword(): void { public function testCheckPasswordWrongUser(): void { $this->prepareAccessForCheckPassword(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $backend->checkPassword('mallory', 'evil'); @@ -212,7 +211,7 @@ public function testCheckPasswordNoDisplayName(): void { ->method('get') ->willReturn(null); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $backend->checkPassword('roland', 'dt19'); @@ -230,7 +229,7 @@ public function testCheckPasswordPublicAPI(): void { ->method('get') ->willReturn($user); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $user = Server::get(IUserManager::class)->checkPassword('roland', 'dt19'); @@ -243,7 +242,7 @@ public function testCheckPasswordPublicAPI(): void { public function testCheckPasswordPublicAPIWrongPassword(): void { $this->prepareAccessForCheckPassword(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $user = Server::get(IUserManager::class)->checkPassword('roland', 'wrong'); @@ -256,7 +255,7 @@ public function testCheckPasswordPublicAPIWrongPassword(): void { public function testCheckPasswordPublicAPIWrongUser(): void { $this->prepareAccessForCheckPassword(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $user = Server::get(IUserManager::class)->checkPassword('mallory', 'evil'); @@ -268,7 +267,7 @@ public function testCheckPasswordPublicAPIWrongUser(): void { } public function testDeleteUserCancel(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->deleteUser('notme'); $this->assertFalse($result); } @@ -305,7 +304,7 @@ public function testDeleteUserSuccess(): void { ->with($uid) ->willReturn(true); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->deleteUser($uid); $this->assertTrue($result); @@ -394,7 +393,7 @@ private function prepareAccessForGetUsers() { public function testGetUsersNoParam(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->getUsers(); $this->assertCount(3, $result); @@ -402,7 +401,7 @@ public function testGetUsersNoParam(): void { public function testGetUsersLimitOffset(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->getUsers('', 1, 2); $this->assertCount(1, $result); @@ -410,7 +409,7 @@ public function testGetUsersLimitOffset(): void { public function testGetUsersLimitOffset2(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->getUsers('', 2, 1); $this->assertCount(2, $result); @@ -418,7 +417,7 @@ public function testGetUsersLimitOffset2(): void { public function testGetUsersSearchWithResult(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->getUsers('yo'); $this->assertCount(2, $result); @@ -426,7 +425,7 @@ public function testGetUsersSearchWithResult(): void { public function testGetUsersSearchEmptyResult(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->getUsers('nix'); $this->assertCount(0, $result); @@ -442,7 +441,7 @@ private function getUsers($search = '', $limit = null, $offset = null) { public function testGetUsersViaAPINoParam(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $this->getUsers(); @@ -451,7 +450,7 @@ public function testGetUsersViaAPINoParam(): void { public function testGetUsersViaAPILimitOffset(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $this->getUsers('', 1, 2); @@ -460,7 +459,7 @@ public function testGetUsersViaAPILimitOffset(): void { public function testGetUsersViaAPILimitOffset2(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $this->getUsers('', 2, 1); @@ -469,7 +468,7 @@ public function testGetUsersViaAPILimitOffset2(): void { public function testGetUsersViaAPISearchWithResult(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $this->getUsers('yo'); @@ -478,7 +477,7 @@ public function testGetUsersViaAPISearchWithResult(): void { public function testGetUsersViaAPISearchEmptyResult(): void { $this->prepareAccessForGetUsers(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $result = $this->getUsers('nix'); @@ -486,7 +485,7 @@ public function testGetUsersViaAPISearchEmptyResult(): void { } public function testUserExists(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->userManager->expects($this->never()) @@ -506,7 +505,7 @@ public function testUserExists(): void { } public function testUserExistsForDeleted(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $mapper = $this->createMock(UserMapping::class); @@ -531,7 +530,7 @@ public function testUserExistsForDeleted(): void { } public function testUserExistsForNeverExisting(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->access->expects($this->any()) @@ -550,7 +549,7 @@ public function testUserExistsForNeverExisting(): void { } public function testUserExistsPublicAPI(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); Server::get(IUserManager::class)->registerBackend($backend); @@ -583,7 +582,7 @@ public function testUserExistsPublicAPI(): void { } public function testDeleteUserExisting(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); //we do not support deleting existing users at all $result = $backend->deleteUser('gunslinger'); @@ -591,7 +590,7 @@ public function testDeleteUserExisting(): void { } public function testGetHomeAbsolutePath(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->connection->expects($this->any()) @@ -645,7 +644,7 @@ public function testGetHomeAbsolutePath(): void { } public function testGetHomeRelative(): void { - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $dataDir = Server::get(IConfig::class)->getSystemValue( @@ -703,7 +702,7 @@ public function testGetHomeRelative(): void { public function testGetHomeNoPath(): void { $this->expectException(\Exception::class); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->connection->expects($this->any()) @@ -748,7 +747,7 @@ public function testGetHomeNoPath(): void { public function testGetHomeDeletedUser(): void { $uid = 'newyorker'; - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->connection->expects($this->any()) @@ -841,7 +840,7 @@ private function prepareAccessForGetDisplayName() { public function testGetDisplayName(): void { $this->prepareAccessForGetDisplayName(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->connection->expects($this->any()) @@ -932,7 +931,7 @@ public function testGetDisplayNamePublicAPI(): void { } }); $this->prepareAccessForGetDisplayName(); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->prepareMockForUserExists(); $this->connection->expects($this->any()) @@ -1024,7 +1023,7 @@ public function testCountUsers(): void { ->method('countUsers') ->willReturn(5); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->countUsers(); $this->assertEquals(5, $result); @@ -1035,7 +1034,7 @@ public function testCountUsersFailing(): void { ->method('countUsers') ->willReturn(false); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $result = $backend->countUsers(); $this->assertFalse($result); @@ -1079,7 +1078,7 @@ public function testLoginName2UserNameSuccess(): void { ->method('writeToCache') ->with($this->equalTo('loginName2UserName-' . $loginName), $this->equalTo($username)); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $user = $this->createMock(User::class); $user->expects($this->any()) ->method('getUsername') @@ -1126,7 +1125,7 @@ public function testLoginName2UserNameNoUsersOnLDAP(): void { ->method('getAttributes') ->willReturn(['dn', 'uid', 'mail', 'displayname']); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $name = $backend->loginName2UserName($loginName); $this->assertSame(false, $name); @@ -1163,7 +1162,7 @@ public function testLoginName2UserNameOfflineUser(): void { ->method('getAttributes') ->willReturn(['dn', 'uid', 'mail', 'displayname']); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $name = $backend->loginName2UserName($loginName); $this->assertSame(false, $name); @@ -1238,7 +1237,7 @@ public function testSetPasswordInvalid(): void { $this->userManager->expects($this->atLeastOnce()) ->method('get') ->willReturn($this->createMock(User::class)); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $this->assertTrue(\OC_User::setPassword('roland', 'dt')); @@ -1251,7 +1250,7 @@ public function testSetPasswordValid(): void { ->method('get') ->willReturn($this->createMock(User::class)); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); $this->userManager->expects($this->any()) ->method('get') ->willReturn($this->createMock(User::class)); @@ -1267,7 +1266,7 @@ public function testSetPasswordValidDisabled(): void { ->willReturn($this->createMock(User::class)); $this->prepareAccessForSetPassword(false); - $backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); + $backend = new User_LDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex); Server::get(IUserManager::class)->registerBackend($backend); $this->assertFalse(\OC_User::setPassword('roland', 'dt12234$')); diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php index 3ae9a409e8866..b492b93256898 100644 --- a/apps/user_ldap/tests/WizardTest.php +++ b/apps/user_ldap/tests/WizardTest.php @@ -18,10 +18,10 @@ /** * Class Test_Wizard * - * @group DB * * @package OCA\User_LDAP\Tests */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class WizardTest extends TestCase { protected function setUp(): void { parent::setUp(); diff --git a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php index 8a21052b09f78..61c07db51e9cf 100644 --- a/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php +++ b/apps/user_status/tests/Integration/Service/StatusServiceIntegrationTest.php @@ -18,9 +18,7 @@ use function sleep; use function time; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class StatusServiceIntegrationTest extends TestCase { private StatusService $service; diff --git a/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php b/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php index 45d66090eae09..ee6f2fc909e27 100644 --- a/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php +++ b/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php @@ -18,9 +18,7 @@ use OCP\User\Events\UserCreatedEvent; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class WebhookListenerMapperTest extends TestCase { private IDBConnection $connection; private WebhookListenerMapper $mapper; diff --git a/apps/workflowengine/tests/Check/FileMimeTypeTest.php b/apps/workflowengine/tests/Check/FileMimeTypeTest.php index 55aea3db1726d..89e0676392eef 100644 --- a/apps/workflowengine/tests/Check/FileMimeTypeTest.php +++ b/apps/workflowengine/tests/Check/FileMimeTypeTest.php @@ -25,9 +25,7 @@ public function instanceOfStorage(string $class): bool { } } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FileMimeTypeTest extends TestCase { /** @var IL10N */ private $l10n; diff --git a/apps/workflowengine/tests/ManagerTest.php b/apps/workflowengine/tests/ManagerTest.php index 4e547db387b67..3f2e5064fbe32 100644 --- a/apps/workflowengine/tests/ManagerTest.php +++ b/apps/workflowengine/tests/ManagerTest.php @@ -40,8 +40,8 @@ * Class ManagerTest * * @package OCA\WorkflowEngine\Tests - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends TestCase { protected Manager $manager; protected IDBConnection $db; diff --git a/build/rector.php b/build/rector.php index fe6952d2b2bd7..e32a064234afc 100644 --- a/build/rector.php +++ b/build/rector.php @@ -12,9 +12,7 @@ use Rector\CodingStyle\Contract\ClassNameImport\ClassNameImportSkipVoterInterface; use Rector\Config\RectorConfig; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; -use Rector\PHPUnit\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector; -use Rector\PHPUnit\CodeQuality\Rector\MethodCall\UseSpecificWillMethodRector; -use Rector\PHPUnit\PHPUnit100\Rector\Class_\StaticDataProviderClassMethodRector; +use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType; use Rector\ValueObject\Application\File; @@ -86,17 +84,13 @@ public function shouldSkip(File $file, FullyQualifiedObjectType $fullyQualifiedO // ->withPhpSets() ->withImportNames(importShortClasses:false) ->withTypeCoverageLevel(0) - ->withRules([ - UseSpecificWillMethodRector::class, - StaticDataProviderClassMethodRector::class, - DataProviderAnnotationToAttributeRector::class, - ]) ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [ 'inline_public' => true, 'rename_property' => true, ]) ->withSets([ NextcloudSets::NEXTCLOUD_27, + PHPUnitSetList::PHPUNIT_100, ]); $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class); diff --git a/composer.json b/composer.json index 1f89ba949d19d..8b4ace64b80c3 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "optimize-autoloader": true, "sort-packages": true, "platform": { - "php": "8.1" + "php": "8.2" }, "allow-plugins": { "bamarni/composer-bin-plugin": true @@ -24,7 +24,7 @@ } }, "require": { - "php": "^8.1", + "php": "^8.2", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", diff --git a/composer.lock b/composer.lock index fb1f18deaa948..0e3fd15839315 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7eec232d4a6c2dea5a37ba784aa1b2ad", + "content-hash": "d065a83a3541ae968e174ccc250e446c", "packages": [], "packages-dev": [ { @@ -67,11 +67,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.1", + "php": "^8.2", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -91,9 +91,9 @@ "ext-zip": "*", "ext-zlib": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.6.0" } diff --git a/core/Controller/WhatsNewController.php b/core/Controller/WhatsNewController.php index 7fa22b0faec1e..e54fb13b8922a 100644 --- a/core/Controller/WhatsNewController.php +++ b/core/Controller/WhatsNewController.php @@ -12,6 +12,7 @@ use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController; use OCP\Defaults; use OCP\IConfig; use OCP\IRequest; @@ -19,7 +20,7 @@ use OCP\L10N\IFactory; use OCP\PreConditionNotMetException; -class WhatsNewController extends \OCP\AppFramework\OCSController { +class WhatsNewController extends OCSController { public function __construct( string $appName, IRequest $request, diff --git a/cron.php b/cron.php index cb858ab09b15a..f86d93b9a739e 100644 --- a/cron.php +++ b/cron.php @@ -41,7 +41,7 @@ $jobClasses = empty($jobClasses) ? null : $jobClasses; if ($verbose) { - $cronService->registerVerboseCallback(function (string $message) { + $cronService->registerVerboseCallback(function (string $message): void { echo $message . PHP_EOL; }); } diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php index 117af9580545a..26bd1878d0dc5 100644 --- a/tests/Core/Command/Apps/AppsDisableTest.php +++ b/tests/Core/Command/Apps/AppsDisableTest.php @@ -16,9 +16,8 @@ /** * Class AppsDisableTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppsDisableTest extends TestCase { /** @var CommandTester */ private $commandTester; diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php index 604c670ae15dd..86f7ca6fcce3c 100644 --- a/tests/Core/Command/Apps/AppsEnableTest.php +++ b/tests/Core/Command/Apps/AppsEnableTest.php @@ -18,9 +18,8 @@ /** * Class AppsEnableTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppsEnableTest extends TestCase { /** @var CommandTester */ private $commandTester; diff --git a/tests/lib/Accounts/AccountManagerTest.php b/tests/lib/Accounts/AccountManagerTest.php index 824e49e9e9ad0..8d66ba15ce15a 100644 --- a/tests/lib/Accounts/AccountManagerTest.php +++ b/tests/lib/Accounts/AccountManagerTest.php @@ -39,9 +39,9 @@ /** * Class AccountManagerTest * - * @group DB * @package Test\Accounts */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AccountManagerTest extends TestCase { /** accounts table name */ diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index 0fb076e203e6b..61aba064f2273 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -23,8 +23,8 @@ * Class HooksTest * * @package Test\Accounts - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HooksTest extends TestCase { private LoggerInterface&MockObject $logger; diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php index 80a38d590f400..9c1020028b045 100644 --- a/tests/lib/AllConfigTest.php +++ b/tests/lib/AllConfigTest.php @@ -8,19 +8,18 @@ namespace Test; -/** - * Class AllConfigTest - * - * @group DB - * - * @package Test - */ use OC\AllConfig; use OC\SystemConfig; use OCP\IDBConnection; use OCP\PreConditionNotMetException; use OCP\Server; +/** + * Class AllConfigTest + * + * @package Test + */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AllConfigTest extends \Test\TestCase { /** @var IDBConnection */ protected $connection; diff --git a/tests/lib/AppConfigIntegrationTest.php b/tests/lib/AppConfigIntegrationTest.php index 4f821e00a6354..7259acb10c54d 100644 --- a/tests/lib/AppConfigIntegrationTest.php +++ b/tests/lib/AppConfigIntegrationTest.php @@ -23,10 +23,9 @@ use Psr\Log\LoggerInterface; /** - * @group DB - * * @package Test */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppConfigIntegrationTest extends TestCase { protected IAppConfig $appConfig; protected IDBConnection $connection; diff --git a/tests/lib/AppFramework/Db/QBMapperDBTest.php b/tests/lib/AppFramework/Db/QBMapperDBTest.php index 14477d98a9683..bf149f1c2e04b 100644 --- a/tests/lib/AppFramework/Db/QBMapperDBTest.php +++ b/tests/lib/AppFramework/Db/QBMapperDBTest.php @@ -61,8 +61,8 @@ public function getById(int $id): QBDBTestEntity { /** * Test real database handling (serialization) - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class QBMapperDBTest extends TestCase { protected IDBConnection $connection; protected bool $schemaSetup = false; diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 6056f87dd42c8..4fbe5c8307ba4 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -22,9 +22,7 @@ use OCP\IRequestId; use PHPUnit\Framework\MockObject\MockObject; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DIContainerTest extends \Test\TestCase { private DIContainer&MockObject $container; diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index ac84ae07a3658..f1e1df8bec40f 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -34,6 +34,9 @@ public function __construct( } class DIIntergrationTests extends TestCase { + public function __construct() { + parent::__construct(static::class); + } private DIContainer $container; private ServerContainer $server; diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 86c78e840e08d..19b587116f931 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -76,8 +76,8 @@ public function test(): Response { * Class DispatcherTest * * @package Test\AppFramework\Http - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DispatcherTest extends \Test\TestCase { /** @var MiddlewareDispatcher */ private $middlewareDispatcher; diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php index b3e02c853e2c6..6624be626442d 100644 --- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php @@ -25,9 +25,7 @@ use Test\AppFramework\Middleware\Security\Mock\RateLimitingMiddlewareController; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RateLimitingMiddlewareTest extends TestCase { private IRequest|MockObject $request; private IUserSession|MockObject $userSession; diff --git a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php index 00ae47928244d..61d2e42ae60e7 100644 --- a/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php +++ b/tests/lib/AppFramework/Utility/ControllerMethodReflectorTest.php @@ -134,9 +134,6 @@ public function testReadTypeIntAnnotations(): void { public function arguments3($a, float $b, int $c, $d) { } - /** - * @requires PHP 7 - */ public function testReadTypeIntAnnotationsScalarTypes(): void { $reader = new ControllerMethodReflector(); $reader->reflect( diff --git a/tests/lib/AppScriptSortTest.php b/tests/lib/AppScriptSortTest.php index 7dc2bde189745..c240770506093 100644 --- a/tests/lib/AppScriptSortTest.php +++ b/tests/lib/AppScriptSortTest.php @@ -16,8 +16,8 @@ * Class AppScriptSortTest * * @package Test - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppScriptSortTest extends \Test\TestCase { private $logger; diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 71186f5ffb010..83944ce2f7eb2 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -27,9 +27,8 @@ /** * Class AppTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class AppTest extends \Test\TestCase { public const TEST_USER1 = 'user1'; public const TEST_USER2 = 'user2'; diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index e6c5296c21656..2f99024e0f4c6 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -18,9 +18,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PublicKeyTokenMapperTest extends TestCase { /** @var PublicKeyTokenMapper */ private $mapper; diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/lib/Authentication/Token/RemoteWipeTest.php index ca09767c75925..b1676e90b9d99 100644 --- a/tests/lib/Authentication/Token/RemoteWipeTest.php +++ b/tests/lib/Authentication/Token/RemoteWipeTest.php @@ -12,7 +12,6 @@ use OC\Authentication\Events\RemoteWipeFinished; use OC\Authentication\Events\RemoteWipeStarted; use OC\Authentication\Exceptions\WipeTokenException; -use OC\Authentication\Token\IProvider; use OC\Authentication\Token\IProvider as ITokenProvider; use OC\Authentication\Token\IToken; use OC\Authentication\Token\IWipeableToken; @@ -39,7 +38,7 @@ class RemoteWipeTest extends TestCase { protected function setUp(): void { parent::setUp(); - $this->tokenProvider = $this->createMock(IProvider::class); + $this->tokenProvider = $this->createMock(ITokenProvider::class); $this->eventDispatcher = $this->createMock(IEventDispatcher::class); $this->logger = $this->createMock(LoggerInterface::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php index f3fd8ee0b630f..bd52dc21821d5 100644 --- a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php @@ -14,9 +14,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ProviderUserAssignmentDaoTest extends TestCase { /** @var IDBConnection */ private $dbConn; diff --git a/tests/lib/BackgroundJob/JobListTest.php b/tests/lib/BackgroundJob/JobListTest.php index 6f946187c52bb..7185acf2beb3e 100644 --- a/tests/lib/BackgroundJob/JobListTest.php +++ b/tests/lib/BackgroundJob/JobListTest.php @@ -23,9 +23,9 @@ /** * Class JobList * - * @group DB * @package Test\BackgroundJob */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class JobListTest extends TestCase { /** @var \OC\BackgroundJob\JobList */ protected $instance; diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/lib/Cache/FileCacheTest.php index 4daa8d3b7effe..be27ff04f09ad 100644 --- a/tests/lib/Cache/FileCacheTest.php +++ b/tests/lib/Cache/FileCacheTest.php @@ -24,10 +24,10 @@ /** * Class FileCacheTest * - * @group DB * * @package Test\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FileCacheTest extends TestCache { use UserTrait; diff --git a/tests/lib/Command/BackgroundModeTest.php b/tests/lib/Command/BackgroundModeTest.php index ab036ef87ee46..8389126fe8ef7 100644 --- a/tests/lib/Command/BackgroundModeTest.php +++ b/tests/lib/Command/BackgroundModeTest.php @@ -16,9 +16,7 @@ use Symfony\Component\Console\Tester\CommandTester; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BackgroundModeTest extends TestCase { private IAppConfig $appConfig; diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php index c86cdcb1da000..a4675f10fdb21 100644 --- a/tests/lib/Command/CronBusTest.php +++ b/tests/lib/Command/CronBusTest.php @@ -11,9 +11,7 @@ use OCP\BackgroundJob\IJobList; use Test\BackgroundJob\DummyJobList; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CronBusTest extends AsyncBusTestCase { /** * @var IJobList diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index bd991a5692abb..d88e062a8ecda 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -31,9 +31,8 @@ /** * Class ManagerTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends TestCase { /** @var IDBConnection */ private $connection; diff --git a/tests/lib/Config/LexiconTest.php b/tests/lib/Config/LexiconTest.php index b422588f66203..d3809892c0e96 100644 --- a/tests/lib/Config/LexiconTest.php +++ b/tests/lib/Config/LexiconTest.php @@ -25,10 +25,10 @@ /** * Class UserPreferencesTest * - * @group DB * * @package Test */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LexiconTest extends TestCase { /** @var AppConfig */ private IAppConfig $appConfig; diff --git a/tests/lib/Config/UserConfigTest.php b/tests/lib/Config/UserConfigTest.php index d570bf020f16b..ca51319997f35 100644 --- a/tests/lib/Config/UserConfigTest.php +++ b/tests/lib/Config/UserConfigTest.php @@ -25,10 +25,10 @@ /** * Class UserPreferencesTest * - * @group DB * * @package Test */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserConfigTest extends TestCase { protected IDBConnection $connection; private IConfig $config; diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php index 3f06082ff0cc3..20348862b7da9 100644 --- a/tests/lib/DB/ConnectionTest.php +++ b/tests/lib/DB/ConnectionTest.php @@ -17,9 +17,7 @@ use OC\DB\Connection; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ConnectionTest extends TestCase { public function testSingleNodeConnectsToPrimaryOnly(): void { diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php index 9d8ee6791a92c..7e6438dd4a0a2 100644 --- a/tests/lib/DB/MigratorTest.php +++ b/tests/lib/DB/MigratorTest.php @@ -24,10 +24,10 @@ /** * Class MigratorTest * - * @group DB * * @package Test\DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MigratorTest extends \Test\TestCase { /** * @var \Doctrine\DBAL\Connection $connection diff --git a/tests/lib/DB/OCPostgreSqlPlatformTest.php b/tests/lib/DB/OCPostgreSqlPlatformTest.php index af17b01fc139d..d76089e6fe5b7 100644 --- a/tests/lib/DB/OCPostgreSqlPlatformTest.php +++ b/tests/lib/DB/OCPostgreSqlPlatformTest.php @@ -19,10 +19,10 @@ * custom OCPostgreSqlPlatform behavior has been upstreamed, test is left to * ensure behavior stays correct. * - * @group DB * * @package Test\DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class OCPostgreSqlPlatformTest extends \Test\TestCase { public function testAlterBigint(): void { $platform = new PostgreSQLPlatform(); diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php index a13490c52f35f..112bfe2ca162d 100644 --- a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php +++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php @@ -16,9 +16,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpressionBuilderDBTest extends TestCase { /** @var \Doctrine\DBAL\Connection|IDBConnection */ protected $connection; diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php index 1373fde5407e1..4adf6618e8159 100644 --- a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php @@ -19,10 +19,10 @@ /** * Class ExpressionBuilderTest * - * @group DB * * @package Test\DB\QueryBuilder */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ExpressionBuilderTest extends TestCase { /** @var ExpressionBuilder */ protected $expressionBuilder; diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php index eea5c952c39c8..2202e6879f331 100644 --- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php @@ -16,10 +16,10 @@ /** * Class FunctionBuilderTest * - * @group DB * * @package Test\DB\QueryBuilder */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FunctionBuilderTest extends TestCase { /** @var \Doctrine\DBAL\Connection|IDBConnection */ protected $connection; diff --git a/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php b/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php index f99adc73aa832..80ed5cd17e565 100644 --- a/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/Partitioned/PartitionedQueryBuilderTest.php @@ -18,9 +18,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PartitionedQueryBuilderTest extends TestCase { private IDBConnection $connection; private ShardConnectionManager $shardConnectionManager; diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index a1c3ae3d905f2..9c4379e6f28f3 100644 --- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php @@ -27,10 +27,10 @@ /** * Class QueryBuilderTest * - * @group DB * * @package Test\DB\QueryBuilder */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class QueryBuilderTest extends \Test\TestCase { private SystemConfig&MockObject $config; private LoggerInterface&MockObject $logger; diff --git a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php index d0f232cb03f54..145a0214570b3 100644 --- a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php @@ -19,9 +19,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SharedQueryBuilderTest extends TestCase { private IDBConnection $connection; private AutoIncrementHandler $autoIncrementHandler; diff --git a/tests/lib/DirectEditing/ManagerTest.php b/tests/lib/DirectEditing/ManagerTest.php index 2ad7f98df498c..f519aeb4ce1d2 100644 --- a/tests/lib/DirectEditing/ManagerTest.php +++ b/tests/lib/DirectEditing/ManagerTest.php @@ -83,8 +83,8 @@ public function open(IToken $token): Response { * Class ManagerTest * * @package Test\DirectEditing - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends TestCase { private $manager; /** diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 5b56ac271c576..f7a6497e011be 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -28,10 +28,10 @@ /** * Class DecryptAllTest * - * @group DB * * @package Test\Encryption */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DecryptAllTest extends TestCase { private IUserManager&MockObject $userManager; private Manager&MockObject $encryptionManager; diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index e9b6ddae8a0bb..6a6e55b1925e4 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -87,9 +87,7 @@ public function testModuleRegistration() { return $this->manager; } - /** - * @depends testModuleRegistration - */ + #[\PHPUnit\Framework\Attributes\Depends('testModuleRegistration')] public function testModuleReRegistration($manager): void { $this->expectException(ModuleAlreadyExistsException::class); $this->expectExceptionMessage('Id "ID0" already used by encryption module "TestDummyModule0"'); diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php index cf97c895dc11e..391baa799601f 100644 --- a/tests/lib/Federation/CloudIdManagerTest.php +++ b/tests/lib/Federation/CloudIdManagerTest.php @@ -19,9 +19,7 @@ use OCP\IUserManager; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CloudIdManagerTest extends TestCase { /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */ protected $contactsManager; diff --git a/tests/lib/Federation/CloudIdTest.php b/tests/lib/Federation/CloudIdTest.php index 67683861e4053..cfda35b545e08 100644 --- a/tests/lib/Federation/CloudIdTest.php +++ b/tests/lib/Federation/CloudIdTest.php @@ -15,9 +15,7 @@ use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CloudIdTest extends TestCase { protected CloudIdManager&MockObject $cloudIdManager; diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index 0ce5a5ac2b38e..c2dca753f5a72 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -33,10 +33,10 @@ public function getId(): string { /** * Class CacheTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CacheTest extends \Test\TestCase { /** * @var Temporary $storage ; diff --git a/tests/lib/Files/Cache/FileAccessTest.php b/tests/lib/Files/Cache/FileAccessTest.php index 9a786f9430a71..36658c5a72102 100644 --- a/tests/lib/Files/Cache/FileAccessTest.php +++ b/tests/lib/Files/Cache/FileAccessTest.php @@ -19,9 +19,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FileAccessTest extends TestCase { private IDBConnection $dbConnection; private FileAccess $fileAccess; diff --git a/tests/lib/Files/Cache/HomeCacheTest.php b/tests/lib/Files/Cache/HomeCacheTest.php index 86fda615fd7f0..f5afecca8886b 100644 --- a/tests/lib/Files/Cache/HomeCacheTest.php +++ b/tests/lib/Files/Cache/HomeCacheTest.php @@ -42,10 +42,10 @@ public function getUID() { /** * Class HomeCacheTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HomeCacheTest extends \Test\TestCase { /** * @var \OC\Files\Storage\Home $storage diff --git a/tests/lib/Files/Cache/LocalRootScannerTest.php b/tests/lib/Files/Cache/LocalRootScannerTest.php index 727da2ed69812..12f785103d19c 100644 --- a/tests/lib/Files/Cache/LocalRootScannerTest.php +++ b/tests/lib/Files/Cache/LocalRootScannerTest.php @@ -13,9 +13,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LocalRootScannerTest extends TestCase { /** @var LocalRootStorage */ private $storage; diff --git a/tests/lib/Files/Cache/MoveFromCacheTraitTest.php b/tests/lib/Files/Cache/MoveFromCacheTraitTest.php index d580cdca4b98e..c7e20f55fbef0 100644 --- a/tests/lib/Files/Cache/MoveFromCacheTraitTest.php +++ b/tests/lib/Files/Cache/MoveFromCacheTraitTest.php @@ -19,9 +19,8 @@ class FallBackCrossCacheMoveCache extends Cache { /** * Class MoveFromCacheTraitTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MoveFromCacheTraitTest extends CacheTest { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php index 2ab213e956735..71e30eea4b0fb 100644 --- a/tests/lib/Files/Cache/PropagatorTest.php +++ b/tests/lib/Files/Cache/PropagatorTest.php @@ -13,9 +13,7 @@ use OCP\Files\Storage\IStorage; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PropagatorTest extends TestCase { /** @var IStorage */ private $storage; diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index 370ad5f60dc47..e8dbc5006f1f2 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -22,10 +22,10 @@ /** * Class ScannerTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ScannerTest extends TestCase { private Storage $storage; private Scanner $scanner; diff --git a/tests/lib/Files/Cache/SearchBuilderTest.php b/tests/lib/Files/Cache/SearchBuilderTest.php index 89589fcd3429a..28fe6aefc77c1 100644 --- a/tests/lib/Files/Cache/SearchBuilderTest.php +++ b/tests/lib/Files/Cache/SearchBuilderTest.php @@ -21,9 +21,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SearchBuilderTest extends TestCase { /** @var IQueryBuilder */ private $builder; diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php index c71fac2d2dc46..fb8083d96707f 100644 --- a/tests/lib/Files/Cache/UpdaterLegacyTest.php +++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php @@ -21,10 +21,10 @@ /** * Class UpdaterLegacyTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UpdaterLegacyTest extends \Test\TestCase { /** * @var Storage $storage diff --git a/tests/lib/Files/Cache/UpdaterTest.php b/tests/lib/Files/Cache/UpdaterTest.php index 65c47cb9ae643..f651617e031e2 100644 --- a/tests/lib/Files/Cache/UpdaterTest.php +++ b/tests/lib/Files/Cache/UpdaterTest.php @@ -20,10 +20,10 @@ /** * Class UpdaterTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UpdaterTest extends \Test\TestCase { /** * @var Storage diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index 6d0a8e0886ba3..a7fa5086b7b15 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -15,10 +15,11 @@ /** * Class WatcherTest * - * @group DB * * @package Test\Files\Cache */ +#[\PHPUnit\Framework\Attributes\Medium] +#[\PHPUnit\Framework\Attributes\Group('DB')] class WatcherTest extends \Test\TestCase { /** * @var Storage[] $storages @@ -42,9 +43,6 @@ protected function tearDown(): void { parent::tearDown(); } - /** - * @medium - */ public function testWatcher(): void { $storage = $this->getTestStorage(); $cache = $storage->getCache(); @@ -83,9 +81,7 @@ public function testWatcher(): void { $this->assertFalse($cache->inCache('folder/bar2.txt')); } - /** - * @medium - */ + public function testFileToFolder(): void { $storage = $this->getTestStorage(); $cache = $storage->getCache(); diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php index 8ac3492fbd210..f5fecdab92b6b 100644 --- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php +++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php @@ -23,10 +23,10 @@ /** * Class CacheJail * - * @group DB * * @package Test\Files\Cache\Wrapper */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CacheJailTest extends CacheTest { /** * @var Cache $sourceCache diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php index 4fbeafc9270ab..f763fd1608c0c 100644 --- a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php +++ b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php @@ -16,10 +16,10 @@ /** * Class CachePermissionsMask * - * @group DB * * @package Test\Files\Cache\Wrapper */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CachePermissionsMaskTest extends CacheTest { /** * @var Cache $sourceCache diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php index bf957e04ed4ef..31a2ea369984b 100644 --- a/tests/lib/Files/Config/UserMountCacheTest.php +++ b/tests/lib/Files/Config/UserMountCacheTest.php @@ -32,9 +32,7 @@ use Test\TestCase; use Test\Util\User\Dummy; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserMountCacheTest extends TestCase { private IDBConnection $connection; private IUserManager $userManager; diff --git a/tests/lib/Files/EtagTest.php b/tests/lib/Files/EtagTest.php index d1b344ee9976a..ccf1319a6a87f 100644 --- a/tests/lib/Files/EtagTest.php +++ b/tests/lib/Files/EtagTest.php @@ -23,10 +23,10 @@ /** * Class EtagTest * - * @group DB * * @package Test\Files */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class EtagTest extends \Test\TestCase { private $datadir; diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index a819acb1620b2..b838310d28b83 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -49,10 +49,10 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) { /** * Class FilesystemTest * - * @group DB * * @package Test\Files */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FilesystemTest extends \Test\TestCase { public const TEST_FILESYSTEM_USER1 = 'test-filesystem-user1'; public const TEST_FILESYSTEM_USER2 = 'test-filesystem-user1'; diff --git a/tests/lib/Files/Mount/RootMountProviderTest.php b/tests/lib/Files/Mount/RootMountProviderTest.php index bf29bfa070a87..fedd62d566347 100644 --- a/tests/lib/Files/Mount/RootMountProviderTest.php +++ b/tests/lib/Files/Mount/RootMountProviderTest.php @@ -18,9 +18,7 @@ use OCP\IConfig; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RootMountProviderTest extends TestCase { private StorageFactory $loader; diff --git a/tests/lib/Files/Node/FileTest.php b/tests/lib/Files/Node/FileTest.php index 0ab8a32b6cbd0..027f48498eab9 100644 --- a/tests/lib/Files/Node/FileTest.php +++ b/tests/lib/Files/Node/FileTest.php @@ -16,10 +16,10 @@ /** * Class FileTest * - * @group DB * * @package Test\Files\Node */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FileTest extends NodeTestCase { protected function createTestNode($root, $view, $path, array $data = [], $internalPath = '', $storage = null) { if ($data || $internalPath || $storage) { diff --git a/tests/lib/Files/Node/FolderTest.php b/tests/lib/Files/Node/FolderTest.php index fc8b778cb3474..8ba0745d4e191 100644 --- a/tests/lib/Files/Node/FolderTest.php +++ b/tests/lib/Files/Node/FolderTest.php @@ -42,10 +42,10 @@ /** * Class FolderTest * - * @group DB * * @package Test\Files\Node */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FolderTest extends NodeTestCase { protected function createTestNode($root, $view, $path, array $data = [], $internalPath = '', $storage = null) { $view->expects($this->any()) diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php index f108b27917986..949fcf7be8bc0 100644 --- a/tests/lib/Files/Node/HookConnectorTest.php +++ b/tests/lib/Files/Node/HookConnectorTest.php @@ -45,10 +45,10 @@ /** * Class HookConnectorTest * - * @group DB * * @package Test\Files\Node */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HookConnectorTest extends TestCase { use UserTrait; use MountProviderTrait; diff --git a/tests/lib/Files/Node/IntegrationTest.php b/tests/lib/Files/Node/IntegrationTest.php index d7a56a0f99dd0..af54a2e162d0c 100644 --- a/tests/lib/Files/Node/IntegrationTest.php +++ b/tests/lib/Files/Node/IntegrationTest.php @@ -26,10 +26,10 @@ /** * Class IntegrationTest * - * @group DB * * @package Test\Files\Node */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class IntegrationTest extends \Test\TestCase { use UserTrait; diff --git a/tests/lib/Files/ObjectStore/AzureTest.php b/tests/lib/Files/ObjectStore/AzureTest.php index 52d2b9e865765..76d1d7f1d8766 100644 --- a/tests/lib/Files/ObjectStore/AzureTest.php +++ b/tests/lib/Files/ObjectStore/AzureTest.php @@ -11,9 +11,7 @@ use OCP\IConfig; use OCP\Server; -/** - * @group PRIMARY-azure - */ +#[\PHPUnit\Framework\Attributes\Group('PRIMARY-azure')] class AzureTest extends ObjectStoreTestCase { protected function getInstance() { $config = Server::get(IConfig::class)->getSystemValue('objectstore'); diff --git a/tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php b/tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php index ea6ac682c70d2..f5af264a25e1c 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreScannerTest.php @@ -14,9 +14,7 @@ use OCP\Files\Storage\IStorage; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreScannerTest extends TestCase { private IStorage $storage; private ICache $cache; diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index 3387808445a3a..f980b49172f7a 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -15,9 +15,7 @@ use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\Storage; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStorageTest extends Storage { /** @var ObjectStoreStorageOverwrite */ protected $instance; diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php index d39426ee8214f..d84df898a12a2 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php @@ -13,9 +13,7 @@ use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesDifferentBucketTest extends StoragesTestCase { /** * @var IObjectStore diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php index 4e42668cd3fe7..5779c0c433626 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php @@ -13,9 +13,7 @@ use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesSameBucketTest extends StoragesTestCase { /** * @var IObjectStore diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php index b75536a214ed7..0a20653f88e3c 100644 --- a/tests/lib/Files/ObjectStore/S3Test.php +++ b/tests/lib/Files/ObjectStore/S3Test.php @@ -44,9 +44,7 @@ public function stream_seek($offset, $whence = SEEK_SET) { } } -/** - * @group PRIMARY-s3 - */ +#[\PHPUnit\Framework\Attributes\Group('PRIMARY-s3')] class S3Test extends ObjectStoreTestCase { public function setUp(): void { parent::setUp(); diff --git a/tests/lib/Files/ObjectStore/SwiftTest.php b/tests/lib/Files/ObjectStore/SwiftTest.php index 3f919c0dd4885..a5d97256dd6fa 100644 --- a/tests/lib/Files/ObjectStore/SwiftTest.php +++ b/tests/lib/Files/ObjectStore/SwiftTest.php @@ -13,9 +13,7 @@ use OCP\IConfig; use OCP\Server; -/** - * @group PRIMARY-swift - */ +#[\PHPUnit\Framework\Attributes\Group('PRIMARY-swift')] class SwiftTest extends ObjectStoreTestCase { /** * @return IObjectStore diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php index e13dbe4f20704..6ba9af5d9eb00 100644 --- a/tests/lib/Files/PathVerificationTest.php +++ b/tests/lib/Files/PathVerificationTest.php @@ -17,10 +17,10 @@ /** * Class PathVerificationTest * - * @group DB * * @package Test\Files */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PathVerificationTest extends \Test\TestCase { /** * @var View diff --git a/tests/lib/Files/Search/QueryOptimizer/CombinedTests.php b/tests/lib/Files/Search/QueryOptimizer/CombinedTests.php index 665224cb63eaa..3590af850c8e6 100644 --- a/tests/lib/Files/Search/QueryOptimizer/CombinedTests.php +++ b/tests/lib/Files/Search/QueryOptimizer/CombinedTests.php @@ -14,6 +14,9 @@ use Test\TestCase; class CombinedTests extends TestCase { + public function __construct() { + parent::__construct(static::class); + } private QueryOptimizer $optimizer; protected function setUp(): void { diff --git a/tests/lib/Files/Search/SearchIntegrationTest.php b/tests/lib/Files/Search/SearchIntegrationTest.php index e3e99bbfaddba..c1efb839eaba6 100644 --- a/tests/lib/Files/Search/SearchIntegrationTest.php +++ b/tests/lib/Files/Search/SearchIntegrationTest.php @@ -14,9 +14,7 @@ use OCP\Files\Search\ISearchComparison; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SearchIntegrationTest extends TestCase { private $cache; private $storage; diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php index 50038b286a93f..9232bdce42fdc 100644 --- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php @@ -16,9 +16,7 @@ use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SimpleFolderTest extends \Test\TestCase { use MountProviderTrait; use UserTrait; diff --git a/tests/lib/Files/Storage/CommonTest.php b/tests/lib/Files/Storage/CommonTest.php index c5ff6bb0b5f3c..f460d579ce226 100644 --- a/tests/lib/Files/Storage/CommonTest.php +++ b/tests/lib/Files/Storage/CommonTest.php @@ -21,10 +21,10 @@ /** * Class CommonTest * - * @group DB * * @package Test\Files\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CommonTest extends Storage { private string $tmpDir; diff --git a/tests/lib/Files/Storage/CopyDirectoryTest.php b/tests/lib/Files/Storage/CopyDirectoryTest.php index b593b7c984f73..141f6532a3d47 100644 --- a/tests/lib/Files/Storage/CopyDirectoryTest.php +++ b/tests/lib/Files/Storage/CopyDirectoryTest.php @@ -27,10 +27,10 @@ class CopyDirectoryStorage extends StorageNoRecursiveCopy { /** * Class CopyDirectoryTest * - * @group DB * * @package Test\Files\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CopyDirectoryTest extends Storage { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Files/Storage/HomeTest.php b/tests/lib/Files/Storage/HomeTest.php index 84a9816cb0c72..2ca9737bf7980 100644 --- a/tests/lib/Files/Storage/HomeTest.php +++ b/tests/lib/Files/Storage/HomeTest.php @@ -37,10 +37,10 @@ public function getUID() { /** * Class Home * - * @group DB * * @package Test\Files\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HomeTest extends Storage { /** * @var string tmpDir diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php index 89449a51351a0..1e05e295dedd5 100644 --- a/tests/lib/Files/Storage/LocalTest.php +++ b/tests/lib/Files/Storage/LocalTest.php @@ -19,10 +19,10 @@ /** * Class LocalTest * - * @group DB * * @package Test\Files\Storage */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class LocalTest extends Storage { /** * @var string tmpDir diff --git a/tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php b/tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php index b1b5582b4ed41..5a8261289aa62 100644 --- a/tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php +++ b/tests/lib/Files/Storage/Wrapper/KnownMtimeTest.php @@ -13,9 +13,7 @@ use Psr\Clock\ClockInterface; use Test\Files\Storage\Storage; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class KnownMtimeTest extends Storage { /** @var Temporary */ private $sourceStorage; diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php index a2f3460c58c23..1b4a55b010b67 100644 --- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php +++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php @@ -14,9 +14,7 @@ use OCP\Constants; use OCP\Files\Cache\IScanner; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PermissionsMaskTest extends \Test\Files\Storage\Storage { /** * @var Temporary diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/lib/Files/Storage/Wrapper/QuotaTest.php index f83f9ed7f6b68..3d313666a93b0 100644 --- a/tests/lib/Files/Storage/Wrapper/QuotaTest.php +++ b/tests/lib/Files/Storage/Wrapper/QuotaTest.php @@ -19,10 +19,10 @@ /** * Class QuotaTest * - * @group DB * * @package Test\Files\Storage\Wrapper */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class QuotaTest extends \Test\Files\Storage\Storage { /** * @var string tmpDir diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php index 49399ef70a6c7..3e60c0234cbc8 100644 --- a/tests/lib/Files/Utils/ScannerTest.php +++ b/tests/lib/Files/Utils/ScannerTest.php @@ -43,10 +43,10 @@ protected function getMounts($dir) { /** * Class ScannerTest * - * @group DB * * @package Test\Files\Utils */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ScannerTest extends \Test\TestCase { /** * @var \Test\Util\User\Dummy diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index e7ad9fcc3046f..5742410740138 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -90,10 +90,11 @@ public function postCallback() { /** * Class ViewTest * - * @group DB * * @package Test\Files */ +#[\PHPUnit\Framework\Attributes\Medium] +#[\PHPUnit\Framework\Attributes\Group('DB')] class ViewTest extends \Test\TestCase { use UserTrait; @@ -172,9 +173,6 @@ protected function tearDown(): void { parent::tearDown(); } - /** - * @medium - */ public function testCacheAPI(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -255,9 +253,6 @@ public function testCacheAPI(): void { $this->assertEquals([], $rootView->getDirectoryContent('/non/existing')); } - /** - * @medium - */ public function testGetPath(): void { $user = $this->createMock(IUser::class); $user->method('getUID') @@ -307,9 +302,6 @@ public function testGetPathNotExisting(): void { $this->assertNull($folderView->getPath($id1)); } - /** - * @medium - */ public function testMountPointOverwrite(): void { $storage1 = $this->getTestStorage(false); $storage2 = $this->getTestStorage(); @@ -391,9 +383,6 @@ public function testAutoScan(): void { $this->assertEquals($textSize, $folderData[0]['size']); } - /** - * @medium - */ public function testSearch(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -441,9 +430,6 @@ public function testSearch(): void { $this->assertCount(3, $folderView->searchByMime('text')); } - /** - * @medium - */ public function testWatcher(): void { $storage1 = $this->getTestStorage(); Filesystem::mount($storage1, [], '/'); @@ -462,27 +448,18 @@ public function testWatcher(): void { $this->assertEquals(3, $cachedData['size']); } - /** - * @medium - */ public function testCopyBetweenStorageNoCross(): void { $storage1 = $this->getTestStorage(true, TemporaryNoCross::class); $storage2 = $this->getTestStorage(true, TemporaryNoCross::class); $this->copyBetweenStorages($storage1, $storage2); } - /** - * @medium - */ public function testCopyBetweenStorageCross(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); $this->copyBetweenStorages($storage1, $storage2); } - /** - * @medium - */ public function testCopyBetweenStorageCrossNonLocal(): void { $storage1 = $this->getTestStorage(true, TemporaryNoLocal::class); $storage2 = $this->getTestStorage(true, TemporaryNoLocal::class); @@ -508,27 +485,18 @@ public function copyBetweenStorages($storage1, $storage2) { $this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt')); } - /** - * @medium - */ public function testMoveBetweenStorageNoCross(): void { $storage1 = $this->getTestStorage(true, TemporaryNoCross::class); $storage2 = $this->getTestStorage(true, TemporaryNoCross::class); $this->moveBetweenStorages($storage1, $storage2); } - /** - * @medium - */ public function testMoveBetweenStorageCross(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); $this->moveBetweenStorages($storage1, $storage2); } - /** - * @medium - */ public function testMoveBetweenStorageCrossNonLocal(): void { $storage1 = $this->getTestStorage(true, TemporaryNoLocal::class); $storage2 = $this->getTestStorage(true, TemporaryNoLocal::class); @@ -549,9 +517,6 @@ public function moveBetweenStorages($storage1, $storage2) { $this->assertTrue($rootView->file_exists('anotherfolder/bar.txt')); } - /** - * @medium - */ public function testUnlink(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -593,9 +558,6 @@ public function testRmdir($method): void { $this->assertFalse($rootView->file_exists('sub')); } - /** - * @medium - */ public function testUnlinkRootMustFail(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -612,9 +574,6 @@ public function testUnlinkRootMustFail(): void { $this->assertFalse($rootView->unlink('/substorage')); } - /** - * @medium - */ public function testTouch(): void { $storage = $this->getTestStorage(true, TemporaryNoTouch::class); @@ -636,9 +595,6 @@ public function testTouch(): void { $this->assertEquals($cachedData['storage_mtime'], $cachedData['mtime']); } - /** - * @medium - */ public function testTouchFloat(): void { $storage = $this->getTestStorage(true, TemporaryNoTouch::class); @@ -653,9 +609,6 @@ public function testTouchFloat(): void { $this->assertEquals(500, $cachedData['mtime']); } - /** - * @medium - */ public function testViewHooks(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); @@ -719,9 +672,6 @@ private function getTestStorage($scan = true, $class = Temporary::class) { return $storage; } - /** - * @medium - */ public function testViewHooksIfRootStartsTheSame(): void { $storage1 = $this->getTestStorage(); $storage2 = $this->getTestStorage(); diff --git a/tests/lib/FilesMetadata/FilesMetadataManagerTest.php b/tests/lib/FilesMetadata/FilesMetadataManagerTest.php index 2f9edba001598..a19ff45101299 100644 --- a/tests/lib/FilesMetadata/FilesMetadataManagerTest.php +++ b/tests/lib/FilesMetadata/FilesMetadataManagerTest.php @@ -26,9 +26,7 @@ use Test\Traits\MountProviderTrait; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class FilesMetadataManagerTest extends TestCase { use UserTrait; use MountProviderTrait; @@ -49,7 +47,7 @@ protected function setUp(): void { $this->jobList = $this->createMock(JobList::class); $this->eventDispatcher = $this->createMock(IEventDispatcher::class); - $this->eventDispatcher->method('dispatchTyped')->willReturnCallback(function (Event $event) { + $this->eventDispatcher->method('dispatchTyped')->willReturnCallback(function (Event $event): void { if ($event instanceof AMetadataEvent) { $name = $event->getNode()->getName(); if (isset($this->metadata[$name])) { diff --git a/tests/lib/Group/Backend.php b/tests/lib/Group/Backend.php index 3c068d8d64b87..23d877012cbd2 100644 --- a/tests/lib/Group/Backend.php +++ b/tests/lib/Group/Backend.php @@ -10,9 +10,8 @@ /** * Class Backend - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] abstract class Backend extends \Test\TestCase { /** * @var \OC\Group\Backend $backend diff --git a/tests/lib/Group/DatabaseTest.php b/tests/lib/Group/DatabaseTest.php index ee6b415604069..b8ec53f0d0d4b 100644 --- a/tests/lib/Group/DatabaseTest.php +++ b/tests/lib/Group/DatabaseTest.php @@ -12,9 +12,8 @@ /** * Class Database - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DatabaseTest extends Backend { private $groups = []; diff --git a/tests/lib/Group/Dummy.php b/tests/lib/Group/Dummy.php index 5f2a81cf0aabf..45e82f1a391c7 100644 --- a/tests/lib/Group/Dummy.php +++ b/tests/lib/Group/Dummy.php @@ -10,10 +10,12 @@ /** * Class Dummy - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class Dummy extends Backend { + public function __construct() { + parent::__construct(static::class); + } protected function setUp(): void { parent::setUp(); $this->backend = new \Test\Util\Group\Dummy(); diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php index 140be04ec647a..81cff4a283e81 100644 --- a/tests/lib/HelperStorageTest.php +++ b/tests/lib/HelperStorageTest.php @@ -19,9 +19,8 @@ /** * Test the storage functions of OC_Helper - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HelperStorageTest extends \Test\TestCase { use UserTrait; diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php index 02181fffff9b8..fe4b32a07fc53 100644 --- a/tests/lib/ImageTest.php +++ b/tests/lib/ImageTest.php @@ -172,9 +172,7 @@ public function testDataNoResource(): void { $this->assertNull($img->data()); } - /** - * @depends testData - */ + #[\PHPUnit\Framework\Attributes\Depends('testData')] public function testToString(): void { $img = new Image(); $img->loadFromFile(OC::$SERVERROOT . '/tests/data/testimage.png'); diff --git a/tests/lib/InfoXmlTest.php b/tests/lib/InfoXmlTest.php index e92ee5b9c0918..9506f87c1b0a0 100644 --- a/tests/lib/InfoXmlTest.php +++ b/tests/lib/InfoXmlTest.php @@ -14,9 +14,9 @@ /** * Class InfoXmlTest * - * @group DB * @package Test */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class InfoXmlTest extends TestCase { private IAppManager $appManager; diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php index e763807be2906..2c2cd5cbd1e97 100644 --- a/tests/lib/InstallerTest.php +++ b/tests/lib/InstallerTest.php @@ -25,8 +25,8 @@ * Class InstallerTest * * @package Test - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class InstallerTest extends TestCase { private static $appid = 'testapp'; private $appstore; diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/lib/Lock/DBLockingProviderTest.php index 872ee55d8a84d..3e6b7c5198e99 100644 --- a/tests/lib/Lock/DBLockingProviderTest.php +++ b/tests/lib/Lock/DBLockingProviderTest.php @@ -17,10 +17,10 @@ /** * Class DBLockingProvider * - * @group DB * * @package Test\Lock */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DBLockingProviderTest extends LockingProvider { /** * @var \OC\Lock\DBLockingProvider diff --git a/tests/lib/Lock/NonCachingDBLockingProviderTest.php b/tests/lib/Lock/NonCachingDBLockingProviderTest.php index 4f05f0ba892ea..a3b878177faed 100644 --- a/tests/lib/Lock/NonCachingDBLockingProviderTest.php +++ b/tests/lib/Lock/NonCachingDBLockingProviderTest.php @@ -13,10 +13,9 @@ use OCP\Server; /** - * @group DB - * * @package Test\Lock */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class NonCachingDBLockingProviderTest extends DBLockingProviderTest { /** * @return ILockingProvider diff --git a/tests/lib/Lockdown/Filesystem/NoFSTest.php b/tests/lib/Lockdown/Filesystem/NoFSTest.php index b471f573fb78b..b257a8b29dc77 100644 --- a/tests/lib/Lockdown/Filesystem/NoFSTest.php +++ b/tests/lib/Lockdown/Filesystem/NoFSTest.php @@ -14,9 +14,7 @@ use OCP\Server; use Test\Traits\UserTrait; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class NoFSTest extends \Test\TestCase { use UserTrait; diff --git a/tests/lib/Memcache/APCuTest.php b/tests/lib/Memcache/APCuTest.php index 199bdf298f65c..3b1132571960c 100644 --- a/tests/lib/Memcache/APCuTest.php +++ b/tests/lib/Memcache/APCuTest.php @@ -10,10 +10,8 @@ use OC\Memcache\APCu; -/** - * @group Memcache - * @group APCu - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] +#[\PHPUnit\Framework\Attributes\Group('APCu')] class APCuTest extends Cache { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Memcache/ArrayCacheTest.php b/tests/lib/Memcache/ArrayCacheTest.php index e71c821729c6f..2e27994d12889 100644 --- a/tests/lib/Memcache/ArrayCacheTest.php +++ b/tests/lib/Memcache/ArrayCacheTest.php @@ -10,9 +10,7 @@ use OC\Memcache\ArrayCache; -/** - * @group Memcache - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] class ArrayCacheTest extends Cache { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Memcache/CasTraitTest.php b/tests/lib/Memcache/CasTraitTest.php index 9de04fa27260f..f3a193ccc92e6 100644 --- a/tests/lib/Memcache/CasTraitTest.php +++ b/tests/lib/Memcache/CasTraitTest.php @@ -11,9 +11,7 @@ use OC\Memcache\ArrayCache; use Test\TestCase; -/** - * @group Memcache - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] class CasTraitTest extends TestCase { /** * @return \OC\Memcache\CasTrait diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php index 31500f31b65d5..338d2888c71cc 100644 --- a/tests/lib/Memcache/FactoryTest.php +++ b/tests/lib/Memcache/FactoryTest.php @@ -51,9 +51,7 @@ public static function isAvailable(): bool { } } -/** - * @group Memcache - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] class FactoryTest extends \Test\TestCase { public const AVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Available_Cache1'; public const AVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Available_Cache2'; diff --git a/tests/lib/Memcache/MemcachedTest.php b/tests/lib/Memcache/MemcachedTest.php index 61e2f42e3d6d2..54ab47c21b52d 100644 --- a/tests/lib/Memcache/MemcachedTest.php +++ b/tests/lib/Memcache/MemcachedTest.php @@ -10,10 +10,8 @@ use OC\Memcache\Memcached; -/** - * @group Memcache - * @group Memcached - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] +#[\PHPUnit\Framework\Attributes\Group('Memcached')] class MemcachedTest extends Cache { public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); diff --git a/tests/lib/Memcache/RedisTest.php b/tests/lib/Memcache/RedisTest.php index c1dcc9549251a..18c08b87c9884 100644 --- a/tests/lib/Memcache/RedisTest.php +++ b/tests/lib/Memcache/RedisTest.php @@ -12,10 +12,8 @@ use OCP\IConfig; use OCP\Server; -/** - * @group Memcache - * @group Redis - */ +#[\PHPUnit\Framework\Attributes\Group('Memcache')] +#[\PHPUnit\Framework\Attributes\Group('Redis')] class RedisTest extends Cache { /** * @var Redis cache; diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php index 80df690ad767b..23f0dabba98f4 100644 --- a/tests/lib/Preview/BackgroundCleanupJobTest.php +++ b/tests/lib/Preview/BackgroundCleanupJobTest.php @@ -25,10 +25,10 @@ /** * Class BackgroundCleanupJobTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BackgroundCleanupJobTest extends \Test\TestCase { use MountProviderTrait; use UserTrait; diff --git a/tests/lib/Preview/BitmapTest.php b/tests/lib/Preview/BitmapTest.php index 36e768010a96c..1758523a3b61a 100644 --- a/tests/lib/Preview/BitmapTest.php +++ b/tests/lib/Preview/BitmapTest.php @@ -13,10 +13,10 @@ /** * Class BitmapTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class BitmapTest extends Provider { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index def113fbf0814..bac8e1b816f93 100644 --- a/tests/lib/Preview/HEICTest.php +++ b/tests/lib/Preview/HEICTest.php @@ -12,10 +12,10 @@ /** * Class BitmapTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HEICTest extends Provider { protected function setUp(): void { if (!in_array('HEIC', \Imagick::queryFormats('HEI*'))) { diff --git a/tests/lib/Preview/ImageTest.php b/tests/lib/Preview/ImageTest.php index 88c3090557f91..65cd194277f34 100644 --- a/tests/lib/Preview/ImageTest.php +++ b/tests/lib/Preview/ImageTest.php @@ -13,10 +13,10 @@ /** * Class ImageTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ImageTest extends Provider { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Preview/MP3Test.php b/tests/lib/Preview/MP3Test.php index faa06fe42a12c..4cd41e4a0b058 100644 --- a/tests/lib/Preview/MP3Test.php +++ b/tests/lib/Preview/MP3Test.php @@ -13,10 +13,10 @@ /** * Class MP3Test * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MP3Test extends Provider { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Preview/MovePreviewJobTest.php b/tests/lib/Preview/MovePreviewJobTest.php index 8c9df4274f0f5..69f730474e7bd 100644 --- a/tests/lib/Preview/MovePreviewJobTest.php +++ b/tests/lib/Preview/MovePreviewJobTest.php @@ -29,9 +29,7 @@ use Psr\Log\LoggerInterface; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MovePreviewJobTest extends TestCase { private IAppData $previewAppData; private PreviewMapper $previewMapper; diff --git a/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php b/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php index e66d5e64649b8..7b995c24b25fd 100644 --- a/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php +++ b/tests/lib/Preview/MovieBrokenStuckFfmpegTest.php @@ -11,10 +11,10 @@ /** * Class MovieTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MovieBrokenStuckFfmpegTest extends MovieTest { protected string $fileName = 'broken-video.webm'; } diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php index b88f057cdd0bb..770e74a4ba902 100644 --- a/tests/lib/Preview/MovieTest.php +++ b/tests/lib/Preview/MovieTest.php @@ -15,10 +15,10 @@ /** * Class MovieTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MovieTest extends Provider { protected string $fileName = 'testimage.mp4'; protected int $width = 560; diff --git a/tests/lib/Preview/MovieTestRemoteFile.php b/tests/lib/Preview/MovieTestRemoteFile.php index 022c4e29cfb27..5a635d34c59d8 100644 --- a/tests/lib/Preview/MovieTestRemoteFile.php +++ b/tests/lib/Preview/MovieTestRemoteFile.php @@ -18,11 +18,14 @@ /** * Class MovieTestRemoteFile * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class MovieTestRemoteFile extends Provider { + public function __construct() { + parent::__construct(static::class); + } // 1080p (1920x1080) 30 FPS HEVC/H264, 10 secs, avg. bitrate: ~10 Mbps protected string $fileName = 'testvideo-remote-file.mp4'; protected int $width = 1920; diff --git a/tests/lib/Preview/OfficeTest.php b/tests/lib/Preview/OfficeTest.php index 62a4767fd2e9c..1095bdc2e177f 100644 --- a/tests/lib/Preview/OfficeTest.php +++ b/tests/lib/Preview/OfficeTest.php @@ -15,10 +15,10 @@ /** * Class OfficeTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class OfficeTest extends Provider { protected function setUp(): void { $binaryFinder = Server::get(IBinaryFinder::class); diff --git a/tests/lib/Preview/PreviewMapperTest.php b/tests/lib/Preview/PreviewMapperTest.php index 8e27a642473d0..0fc5420e23503 100644 --- a/tests/lib/Preview/PreviewMapperTest.php +++ b/tests/lib/Preview/PreviewMapperTest.php @@ -16,9 +16,7 @@ use OCP\Server; use Test\TestCase; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class PreviewMapperTest extends TestCase { private PreviewMapper $previewMapper; private IDBConnection $connection; diff --git a/tests/lib/Preview/PreviewServiceTest.php b/tests/lib/Preview/PreviewServiceTest.php index f3f9c8ae895d3..09f6a891402d9 100644 --- a/tests/lib/Preview/PreviewServiceTest.php +++ b/tests/lib/Preview/PreviewServiceTest.php @@ -17,10 +17,8 @@ use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\TestCase; -/** - * @group DB - */ #[CoversClass(PreviewService::class)] +#[\PHPUnit\Framework\Attributes\Group('DB')] class PreviewServiceTest extends TestCase { private PreviewService $previewService; private PreviewMapper $previewMapper; diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php index d8f10c430e43c..22b64b582923b 100644 --- a/tests/lib/Preview/Provider.php +++ b/tests/lib/Preview/Provider.php @@ -72,12 +72,12 @@ public static function dimensionsDataProvider() { /** * Launches all the tests we have * - * @requires extension imagick * * @param int $widthAdjustment * @param int $heightAdjustment */ #[\PHPUnit\Framework\Attributes\DataProvider('dimensionsDataProvider')] + #[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] public function testGetThumbnail($widthAdjustment, $heightAdjustment): void { $ratio = round($this->width / $this->height, 2); $this->maxWidth = $this->width - $widthAdjustment; diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php index 8c6d9bb669153..2fad472034581 100644 --- a/tests/lib/Preview/SVGTest.php +++ b/tests/lib/Preview/SVGTest.php @@ -14,10 +14,10 @@ /** * Class SVGTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SVGTest extends Provider { protected function setUp(): void { $checkImagick = new \Imagick(); @@ -45,10 +45,8 @@ public static function dataGetThumbnailSVGHref(): array { ]; } - /** - * @requires extension imagick - */ #[\PHPUnit\Framework\Attributes\DataProvider('dataGetThumbnailSVGHref')] + #[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] public function testGetThumbnailSVGHref(string $content): void { $handle = fopen('php://temp', 'w+'); fwrite($handle, ' diff --git a/tests/lib/Preview/TXTTest.php b/tests/lib/Preview/TXTTest.php index d722495136c93..c1c9952c68ba5 100644 --- a/tests/lib/Preview/TXTTest.php +++ b/tests/lib/Preview/TXTTest.php @@ -13,10 +13,10 @@ /** * Class TXTTest * - * @group DB * * @package Test\Preview */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TXTTest extends Provider { protected function setUp(): void { parent::setUp(); diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/lib/Repair/CleanTagsTest.php index 04afabb87d901..80d16b9444fea 100644 --- a/tests/lib/Repair/CleanTagsTest.php +++ b/tests/lib/Repair/CleanTagsTest.php @@ -19,10 +19,10 @@ /** * Tests for the cleaning the tags tables * - * @group DB * * @see \OC\Repair\CleanTags */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CleanTagsTest extends \Test\TestCase { private ?int $createdFile = null; diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/lib/Repair/OldGroupMembershipSharesTest.php index 099290b18ed89..a385c1c9fc000 100644 --- a/tests/lib/Repair/OldGroupMembershipSharesTest.php +++ b/tests/lib/Repair/OldGroupMembershipSharesTest.php @@ -19,10 +19,10 @@ /** * Class OldGroupMembershipSharesTest * - * @group DB * * @package Test\Repair */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class OldGroupMembershipSharesTest extends \Test\TestCase { private IDBConnection $connection; diff --git a/tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php b/tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php index a3eb163b0d680..2c735b7bc6df2 100644 --- a/tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php +++ b/tests/lib/Repair/Owncloud/UpdateLanguageCodesTest.php @@ -19,10 +19,10 @@ /** * Class UpdateLanguageCodesTest * - * @group DB * * @package Test\Repair */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UpdateLanguageCodesTest extends TestCase { protected IDBConnection $connection; diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php index 3c51325562d0e..ea6e70b216486 100644 --- a/tests/lib/Repair/RepairCollationTest.php +++ b/tests/lib/Repair/RepairCollationTest.php @@ -31,10 +31,10 @@ public function getAllNonUTF8BinTables(IDBConnection $connection) { /** * Tests for the converting of MySQL tables to InnoDB engine * - * @group DB * * @see \OC\Repair\RepairMimeTypes */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RepairCollationTest extends TestCase { private TestCollationRepair $repair; diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index 72103976da527..2171a34a6f07e 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -20,10 +20,10 @@ /** * Tests for repairing invalid shares * - * @group DB * * @see \OC\Repair\RepairInvalidShares */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RepairInvalidSharesTest extends TestCase { private RepairInvalidShares $repair; diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index 0261b56ebe97d..40272c18c72e3 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -20,10 +20,10 @@ /** * Tests for the converting of legacy storages to home storages. * - * @group DB * * @see \OC\Repair\RepairMimeTypes */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class RepairMimeTypesTest extends \Test\TestCase { private RepairMimeTypes $repair; diff --git a/tests/lib/Route/RouterTest.php b/tests/lib/Route/RouterTest.php index 560cd5d3aedfb..05ebc90806b15 100644 --- a/tests/lib/Route/RouterTest.php +++ b/tests/lib/Route/RouterTest.php @@ -21,10 +21,10 @@ /** * Class RouterTest * - * @group RoutingWeirdness * * @package Test\Route */ +#[\PHPUnit\Framework\Attributes\Group('RoutingWeirdness')] class RouterTest extends TestCase { private Router $router; private IAppManager&MockObject $appManager; diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index 4dadc824ef6a3..2ee77ab74fbd0 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -25,9 +25,8 @@ /** * Class CertificateManagerTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CertificateManagerTest extends \Test\TestCase { use \Test\Traits\UserTrait; use \Test\Traits\MountProviderTrait; diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php index 4dfe8c5681d7f..e115a0c43218c 100644 --- a/tests/lib/Security/CredentialsManagerTest.php +++ b/tests/lib/Security/CredentialsManagerTest.php @@ -13,9 +13,7 @@ use OCP\Security\ICredentialsManager; use OCP\Server; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class CredentialsManagerTest extends \Test\TestCase { #[\PHPUnit\Framework\Attributes\DataProvider('credentialsProvider')] public function testWithDB($userId, $identifier): void { diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php index b070641e85667..d478bea089e63 100644 --- a/tests/lib/ServerTest.php +++ b/tests/lib/ServerTest.php @@ -16,10 +16,10 @@ /** * Class Server * - * @group DB * * @package Test */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ServerTest extends \Test\TestCase { /** @var Server */ protected $server; diff --git a/tests/lib/Share/HelperTest.php b/tests/lib/Share/HelperTest.php index 3438f10874940..de3b407612b1a 100644 --- a/tests/lib/Share/HelperTest.php +++ b/tests/lib/Share/HelperTest.php @@ -10,10 +10,7 @@ use OC\Share\Helper; -/** - * @group DB - * Class Helper - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class HelperTest extends \Test\TestCase { public static function expireDateProvider(): array { return [ diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php index 9690d24206753..ba86f3c3d3bcd 100644 --- a/tests/lib/Share/ShareTest.php +++ b/tests/lib/Share/ShareTest.php @@ -21,9 +21,8 @@ /** * Class Test_Share - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareTest extends \Test\TestCase { protected $itemType; diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index 6b4b0356061aa..d79dbbada3d84 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -41,8 +41,8 @@ * Class DefaultShareProviderTest * * @package Test\Share20 - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DefaultShareProviderTest extends \Test\TestCase { /** @var IDBConnection */ protected $dbConn; diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index aa42b685ffab1..7c5e5a6e7439d 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -74,8 +74,8 @@ public function listener() { * Class ManagerTest * * @package Test\Share20 - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends \Test\TestCase { /** @var Manager */ protected $manager; diff --git a/tests/lib/Share20/ShareByMailProviderTest.php b/tests/lib/Share20/ShareByMailProviderTest.php index 5180f49f2278d..c2fd0a77ee9d0 100644 --- a/tests/lib/Share20/ShareByMailProviderTest.php +++ b/tests/lib/Share20/ShareByMailProviderTest.php @@ -35,8 +35,8 @@ * Class ShareByMailProviderTest * * @package Test\Share20 - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ShareByMailProviderTest extends TestCase { use EmailValidatorTrait; diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 8e90ff2e1b256..4c0b1c3343435 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -19,9 +19,7 @@ use OCP\IUserManager; use OCP\Server; -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SubAdminTest extends \Test\TestCase { /** @var IUserManager */ private $userManager; diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index 4d2741ba6c5bf..897d8e15d37e9 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -26,9 +26,9 @@ /** * Class TestSystemTagManager * - * @group DB * @package Test\SystemTag */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SystemTagManagerTest extends TestCase { private ISystemTagManager $tagManager; private IDBConnection $connection; diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index e459b81512d75..5542d046d88f2 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -26,9 +26,9 @@ /** * Class TestSystemTagObjectMapper * - * @group DB * @package Test\SystemTag */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SystemTagObjectMapperTest extends TestCase { /** * @var ISystemTagManager diff --git a/tests/lib/TagsTest.php b/tests/lib/TagsTest.php index 4aeaeeed86eb4..9528fc291848b 100644 --- a/tests/lib/TagsTest.php +++ b/tests/lib/TagsTest.php @@ -24,9 +24,8 @@ /** * Class TagsTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TagsTest extends \Test\TestCase { protected $objectType; /** @var IUser */ @@ -269,9 +268,7 @@ public function testTagAs(): void { $this->assertEquals(9, count($tagger->getIdsForTag('Family'))); } - /** - * @depends testTagAs - */ + #[\PHPUnit\Framework\Attributes\Depends('testTagAs')] public function testUnTag(): void { $objIds = [1, 2, 3, 4, 5, 6, 7, 8, 9]; diff --git a/tests/lib/TaskProcessing/TaskProcessingTest.php b/tests/lib/TaskProcessing/TaskProcessingTest.php index 9e663102acec9..395bd467b3722 100644 --- a/tests/lib/TaskProcessing/TaskProcessingTest.php +++ b/tests/lib/TaskProcessing/TaskProcessingTest.php @@ -570,9 +570,7 @@ public function getOutputShape(): array { } } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TaskProcessingTest extends \Test\TestCase { private IManager $manager; private Coordinator $coordinator; diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index e5c999ffc9d1a..54368c93b8bcb 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -10,7 +10,9 @@ use DOMDocument; use DOMNode; +use OC\App\AppStore\Fetcher\AppFetcher; use OC\Command\QueueBus; +use OC\Files\AppData\Factory; use OC\Files\Cache\Storage; use OC\Files\Config\MountProviderCollection; use OC\Files\Filesystem; @@ -20,7 +22,9 @@ use OC\Files\ObjectStore\PrimaryObjectStoreConfig; use OC\Files\SetupManager; use OC\Files\View; +use OC\Installer; use OC\Template\Base; +use OC\Updater; use OCP\AppFramework\QueryException; use OCP\Command\IBus; use OCP\DB\QueryBuilder\IQueryBuilder; @@ -338,10 +342,10 @@ public static function tearDownAfterClass(): void { self::tearDownAfterClassCleanStrayLocks(); // Ensure we start with fresh instances of some classes to reduce side-effects between tests - unset(\OC::$server[\OC\Files\AppData\Factory::class]); - unset(\OC::$server[\OC\App\AppStore\Fetcher\AppFetcher::class]); - unset(\OC::$server[\OC\Installer::class]); - unset(\OC::$server[\OC\Updater::class]); + unset(\OC::$server[Factory::class]); + unset(\OC::$server[AppFetcher::class]); + unset(\OC::$server[Installer::class]); + unset(\OC::$server[Updater::class]); /** @var SetupManager $setupManager */ $setupManager = Server::get(SetupManager::class); diff --git a/tests/lib/TextProcessing/TextProcessingTest.php b/tests/lib/TextProcessing/TextProcessingTest.php index bdcb4a57d7c91..c25e50054673c 100644 --- a/tests/lib/TextProcessing/TextProcessingTest.php +++ b/tests/lib/TextProcessing/TextProcessingTest.php @@ -88,9 +88,7 @@ public function getTaskType(): string { } } -/** - * @group DB - */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class TextProcessingTest extends \Test\TestCase { private IManager $manager; private Coordinator $coordinator; diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index e8f88d8f35b80..b91c3e41ea8e7 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -69,7 +69,6 @@ private function mockBaseUrl() { } /** - * @small * test linkTo URL construction */ #[\PHPUnit\Framework\Attributes\DataProvider('provideDocRootAppUrlParts')] @@ -80,7 +79,6 @@ public function testLinkToDocRoot($app, $file, $args, $expectedResult): void { } /** - * @small * test linkTo URL construction in sub directory */ #[\PHPUnit\Framework\Attributes\DataProvider('provideSubDirAppUrlParts')] @@ -131,7 +129,6 @@ public static function provideSubDirAppUrlParts(): array { } /** - * @small * test absolute URL construction */ #[\PHPUnit\Framework\Attributes\DataProvider('provideDocRootURLs')] @@ -143,7 +140,6 @@ public function testGetAbsoluteURLDocRoot($url, $expectedResult): void { } /** - * @small * test absolute URL construction */ #[\PHPUnit\Framework\Attributes\DataProvider('provideSubDirURLs')] diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index 33101173c0a0a..0afd54c345c41 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -18,9 +18,8 @@ /** * Class DatabaseTest - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class DatabaseTest extends Backend { /** @var array */ private $users; diff --git a/tests/lib/User/Dummy.php b/tests/lib/User/Dummy.php index ec5be8ec60a1e..4b59bc5a4f529 100644 --- a/tests/lib/User/Dummy.php +++ b/tests/lib/User/Dummy.php @@ -9,6 +9,9 @@ namespace Test\User; class Dummy extends Backend { + public function __construct() { + parent::__construct(static::class); + } protected function setUp(): void { parent::setUp(); $this->backend = new \Test\Util\User\Dummy(); diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index d5872787d0a3f..7832fc38890c3 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -26,10 +26,10 @@ /** * Class ManagerTest * - * @group DB * * @package Test\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class ManagerTest extends TestCase { /** @var IConfig */ private $config; @@ -694,10 +694,8 @@ public function testCallForSeenUsers(): void { $user4->delete(); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(enabled: false)] public function testRecentlyActive(): void { $config = Server::get(IConfig::class); $manager = Server::get(IUserManager::class); diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php index 50c449559a003..e74dcaae6f2ec 100644 --- a/tests/lib/User/SessionTest.php +++ b/tests/lib/User/SessionTest.php @@ -42,9 +42,9 @@ use function get_class_methods; /** - * @group DB * @package Test\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class SessionTest extends \Test\TestCase { /** @var ITimeFactory|MockObject */ private $timeFactory; diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index 05056c9219351..c1e07a0f153d9 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -30,10 +30,10 @@ /** * Class UserTest * - * @group DB * * @package Test\User */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UserTest extends TestCase { /** @var IEventDispatcher|MockObject */ protected $dispatcher; diff --git a/tests/lib/UtilCheckServerTest.php b/tests/lib/UtilCheckServerTest.php index 087c67120a374..210085ff1dd59 100644 --- a/tests/lib/UtilCheckServerTest.php +++ b/tests/lib/UtilCheckServerTest.php @@ -16,9 +16,8 @@ /** * Tests for server check functions - * - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UtilCheckServerTest extends \Test\TestCase { private $datadir; diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php index 6d995be2434b0..6738cafdb1ff2 100644 --- a/tests/lib/UtilTest.php +++ b/tests/lib/UtilTest.php @@ -20,8 +20,8 @@ * Class UtilTest * * @package Test - * @group DB */ +#[\PHPUnit\Framework\Attributes\Group('DB')] class UtilTest extends \Test\TestCase { public function testGetVersion(): void { $version = Util::getVersion(); diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index c2c3ecc5a46c8..179cc370b921e 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -2,7 +2,7 @@ "config": { "sort-packages": true, "platform": { - "php": "8.1" + "php": "8.2" } }, "require": { diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 1c6ca8a14cf88..8d492f58961cc 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "427da07c086c9f916d995f88b29aba1b", + "content-hash": "8cbbdb84c616b60e794c2dbc79430b55", "packages": [ { "name": "kubawerlos/php-cs-fixer-custom-fixers", @@ -159,13 +159,13 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { - "php": "8.1" + "php": "8.2" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/openapi-extractor/composer.json b/vendor-bin/openapi-extractor/composer.json index f200921c4336d..f0ef6a13cb4fc 100644 --- a/vendor-bin/openapi-extractor/composer.json +++ b/vendor-bin/openapi-extractor/composer.json @@ -2,7 +2,7 @@ "config": { "sort-packages": true, "platform": { - "php": "8.1" + "php": "8.2" } }, "require": { diff --git a/vendor-bin/openapi-extractor/composer.lock b/vendor-bin/openapi-extractor/composer.lock index c614d788a6b2f..097745a47caf0 100644 --- a/vendor-bin/openapi-extractor/composer.lock +++ b/vendor-bin/openapi-extractor/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "23c96ff7007b72dfd2bbe9cbf35a2843", + "content-hash": "3ff765a37b9cd42a699a884d4ca86687", "packages": [ { "name": "adhocore/cli", @@ -241,7 +241,7 @@ "platform": {}, "platform-dev": {}, "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json index 95b1a7011fd14..6fb72349d0369 100644 --- a/vendor-bin/phpunit/composer.json +++ b/vendor-bin/phpunit/composer.json @@ -1,11 +1,11 @@ { - "config": { - "sort-packages": true, - "platform": { - "php": "8.1" - } - }, - "require": { - "phpunit/phpunit": "^10.5.35" - } + "config": { + "sort-packages": true, + "platform": { + "php": "8.2" + } + }, + "require": { + "phpunit/phpunit": "^10.5.35" + } } diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock index c0dbf64476851..060c0e96a074a 100644 --- a/vendor-bin/phpunit/composer.lock +++ b/vendor-bin/phpunit/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cc73ab48735180a776db9ff4490049a1", + "content-hash": "fe499dcaa1d3271e1c594fa83044161b", "packages": [ { "name": "myclabs/deep-copy", @@ -1634,13 +1634,13 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json index 295103105ca52..385aa00bc1a03 100644 --- a/vendor-bin/psalm/composer.json +++ b/vendor-bin/psalm/composer.json @@ -1,13 +1,13 @@ { - "require": { - "vimeo/psalm": "^5.9" - }, - "config": { - "platform": { - "php": "8.1" - }, - "allow-plugins": { - "composer/package-versions-deprecated": true - } - } + "require": { + "vimeo/psalm": "^5.9" + }, + "config": { + "platform": { + "php": "8.2" + }, + "allow-plugins": { + "composer/package-versions-deprecated": true + } + } } diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock index 2cc0e04b18e6e..2101e58472bd4 100644 --- a/vendor-bin/psalm/composer.lock +++ b/vendor-bin/psalm/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "686c83ce8e622abe36a4790642b55ebe", + "content-hash": "3c3342f1efd61cbab152269740efd448", "packages": [ { "name": "amphp/amp", @@ -2091,13 +2091,13 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { - "php": "8.1" + "php": "8.2" }, "plugin-api-version": "2.6.0" } diff --git a/vendor-bin/rector/composer.json b/vendor-bin/rector/composer.json index 1398ed359ee30..a4d4581f759ff 100644 --- a/vendor-bin/rector/composer.json +++ b/vendor-bin/rector/composer.json @@ -1,6 +1,11 @@ { - "require-dev": { - "rector/rector": "^2.0", - "nextcloud/rector": "^0.4.1" - } + "require-dev": { + "rector/rector": "^2.0", + "nextcloud/rector": "^0.4.1" + }, + "config": { + "platform": { + "php": "8.2" + } + } } diff --git a/vendor-bin/rector/composer.lock b/vendor-bin/rector/composer.lock index b8784a2d6c7aa..c6ffabfe3858e 100644 --- a/vendor-bin/rector/composer.lock +++ b/vendor-bin/rector/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "347262bc75027c88fa21b011f732aa31", + "content-hash": "95ec45e01b8b0c2e38a68797676d1673", "packages": [], "packages-dev": [ { "name": "nextcloud/ocp", - "version": "v31.0.4", + "version": "v32.0.0", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "1fb984268039921920ade298ef5a58e8fe3de7da" + "reference": "f25b267f759f10e5aad18ed15f14b9881df5652d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/1fb984268039921920ade298ef5a58e8fe3de7da", - "reference": "1fb984268039921920ade298ef5a58e8fe3de7da", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f25b267f759f10e5aad18ed15f14b9881df5652d", + "reference": "f25b267f759f10e5aad18ed15f14b9881df5652d", "shasum": "" }, "require": { @@ -31,7 +31,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-stable31": "31.0.0-dev" + "dev-stable32": "32.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -51,9 +51,9 @@ "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/v31.0.4" + "source": "https://github.com/nextcloud-deps/ocp/tree/v32.0.0" }, - "time": "2025-04-15T00:50:16+00:00" + "time": "2025-09-16T00:45:44+00:00" }, { "name": "nextcloud/rector", @@ -436,28 +436,28 @@ }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "541057574806f942c94662b817a50f63f7345360" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/541057574806f942c94662b817a50f63f7345360", + "reference": "541057574806f942c94662b817a50f63f7345360", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -488,9 +488,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.0" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-20T12:43:39+00:00" } ], "aliases": [], @@ -500,5 +500,8 @@ "prefer-lowest": false, "platform": {}, "platform-dev": {}, + "platform-overrides": { + "php": "8.2" + }, "plugin-api-version": "2.6.0" }