Merge pull request #2202 from nextcloud/chore/noid/phpunit-11

test: upgrade to PHPUnit 11

Author: miaulalala

composer.json

@@ -6,7 +6,7 @@
 		"optimize-autoloader": true,
 		"classmap-authoritative": true,
 		"platform": {
-			"php": "8.3"
+			"php": "8.2"
 		},
 		"sort-packages": true,
 		"allow-plugins": {

lib/AppInfo/Application.php

@@ -35,7 +35,9 @@
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
+use OCP\Mail\IEmailValidator;
 use OCP\Mail\IMailer;
+use OCP\Notification\IManager as INotificationManager;
 use OCP\RichObjectStrings\IValidator;
 use OCP\Share\Events\BeforeShareDeletedEvent;
 use OCP\Share\Events\ShareCreatedEvent;
@@ -118,6 +120,7 @@ public function register(IRegistrationContext $context): void {
 				$c->get(Data::class),
 				$c->get(GroupHelper::class),
 				$c->get(UserSettings::class),
+				$c->get(IEmailValidator::class),
 			);
 		});
 
@@ -144,25 +147,24 @@ public function boot(IBootContext $context): void {
 	/**
 	 * Registers the consumer to the Activity Manager
 	 */
-	private function registerActivityConsumer() {
+	private function registerActivityConsumer(): void {
 		$c = $this->getContainer();
-		/** @var \OCP\IServerContainer $server */
 		$server = $c->getServer();
 
-		$server->getActivityManager()->registerConsumer(function () use ($c) {
-			return $c->query(Consumer::class);
+		$server->get(IManager::class)->registerConsumer(function () use ($c) {
+			return $c->get(Consumer::class);
 		});
 	}
 
-	public function registerNotifier() {
+	public function registerNotifier(): void {
 		$server = $this->getContainer()->getServer();
-		$server->getNotificationManager()->registerNotifierService(NotificationGenerator::class);
+		$server->get(INotificationManager::class)->registerNotifierService(NotificationGenerator::class);
 	}
 
 	/**
 	 * Register the hooks for filesystem operations
 	 */
-	private function registerFilesActivity(IRegistrationContext $context) {
+	private function registerFilesActivity(IRegistrationContext $context): void {
 		// All other events from other apps have to be send via the Consumer
 		Util::connectHook('OC_Filesystem', 'post_create', FilesHooksStatic::class, 'fileCreate');
 		Util::connectHook('OC_Filesystem', 'post_update', FilesHooksStatic::class, 'fileUpdate');

lib/Controller/FeedController.php

@@ -13,6 +13,8 @@
 use OCA\Theming\ThemingDefaults;
 use OCP\Activity\IManager;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -40,13 +42,9 @@ public function __construct(
 		parent::__construct($appName, $request);
 	}
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return TemplateResponse
-	 */
-	public function show() {
+	#[PublicPage]
+	#[NoCSRFRequired]
+	public function show(): TemplateResponse {
 		try {
 			$user = $this->activityManager->getCurrentUserId();
 
@@ -83,7 +81,7 @@ public function show() {
 			'activities' => $activities,
 		], '');
 
-		if (stristr($this->request->getHeader('accept'), 'application/rss+xml')) {
+		if (stripos($this->request->getHeader('accept'), 'application/rss+xml') !== false) {
 			$response->addHeader('Content-Type', 'application/rss+xml');
 		} else {
 			$response->addHeader('Content-Type', 'text/xml; charset=UTF-8');

lib/Listener/SetUserDefaults.php

@@ -10,6 +10,7 @@
 
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\User\Events\PostLoginEvent;
@@ -18,11 +19,11 @@
  * @template-implements IEventListener<Event>
  */
 class SetUserDefaults implements IEventListener {
-	/** @var IConfig */
-	private $config;
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
+	public function __construct(
+		private IConfig $config,
+		private IAppConfig $appConfig,
+	) {
 	}
 
 	#[\Override]
@@ -41,8 +42,8 @@ private function setDefaultsForUser(IUser $user): void {
 			return;
 		}
 
-		foreach ($this->config->getAppKeys('activity') as $key) {
-			if (strpos($key, 'notify_') !== 0) {
+		foreach ($this->appConfig->getKeys('activity') as $key) {
+			if (!str_starts_with($key, 'notify_')) {
 				continue;
 			}
 
@@ -55,7 +56,7 @@ private function setDefaultsForUser(IUser $user): void {
 				$user->getUID(),
 				'activity',
 				$key,
-				$this->config->getAppValue('activity', $key)
+				$this->appConfig->getValueString('activity', $key)
 			);
 		}
 

lib/MailQueueHandler.php

@@ -20,6 +20,7 @@
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Mail\Headers\AutoSubmitted;
+use OCP\Mail\IEmailValidator;
 use OCP\Mail\IMailer;
 use OCP\RichObjectStrings\IValidator;
 use OCP\Util;
@@ -55,6 +56,7 @@ public function __construct(
 		protected Data $data,
 		protected GroupHelper $groupHelper,
 		protected UserSettings $userSettings,
+		protected IEmailValidator $emailValidator,
 	) {
 	}
 
@@ -271,7 +273,7 @@ protected function sendEmailToUser(string $userName, string $email, string $lang
 			return true;
 		}
 
-		if (!$this->mailer->validateMailAddress($email)) {
+		if (!$this->emailValidator->isValid($email)) {
 			$this->logger->warning('Notification for user "{user}" not sent because the email address "{email}" is invalid.', ['user' => $userName, 'email' => $email]);
 			return true;
 		}

tests/AppInfo/ApplicationTest.php

@@ -47,23 +47,22 @@
 use OCA\Activity\ViewInfoCache;
 use OCP\Activity\IConsumer;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\OCSController;
 use OCP\BackgroundJob\TimedJob;
 use OCP\Capabilities\ICapability;
 use OCP\IL10N;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Class ApplicationTest
  *
  * @group DB
  * @package OCA\Activity\Tests\AppInfo
  */
+#[Group('DB')]
 class ApplicationTest extends TestCase {
-	/** @var Application */
-	protected $app;
-
-	/** @var IAppContainer */
+	protected Application $app;
 	protected $container;
 
 	protected function setUp(): void {
@@ -74,10 +73,10 @@ protected function setUp(): void {
 
 	public function testContainerAppName(): void {
 		$this->app = new Application();
-		$this->assertEquals('activity', $this->container->getAppName());
+		$this->assertEquals($this->app::APP_ID, $this->container->getAppName());
 	}
 
-	public function queryData(): array {
+	public static function queryData(): array {
 		return [
 			[IL10N::class],
 			[View::class],
@@ -119,11 +118,7 @@ public function queryData(): array {
 		];
 	}
 
-	/**
-	 * @dataProvider queryData
-	 * @param string $service
-	 * @param string $expected
-	 */
+	#[DataProvider('queryData')]
 	public function testContainerQuery(string $service, ?string $expected = null): void {
 		if ($expected === null) {
 			$expected = $service;

tests/BackgroundJob/EmailNotificationTest.php

@@ -29,25 +29,23 @@
 use OCA\Activity\Tests\TestCase;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Class EmailNotificationTest
- *
- * @group DB
  * @package OCA\Activity\Tests\BackgroundJob
  */
+#[Group('DB')]
 class EmailNotificationTest extends TestCase {
-	public function constructAndRunData(): array {
+	public static function constructAndRunData(): array {
 		return [
 			[true],
 			[false],
 		];
 	}
 
-	/**
-	 * @dataProvider constructAndRunData
-	 * @param bool $isCLI
-	 */
+	#[DataProvider('constructAndRunData')]
 	public function testConstructAndRun(bool $isCLI): void {
 		$backgroundJob = new EmailNotification(
 			$this->createMock(ITimeFactory::class),

tests/BackgroundJob/ExpireActivitiesTest.php

@@ -31,13 +31,13 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
+use PHPUnit\Framework\Attributes\Group;
 
 /**
  * Class ExpireActivitiesTest
- *
- * @group DB
  * @package OCA\Activity\Tests\BackgroundJob
  */
+#[Group('DB')]
 class ExpireActivitiesTest extends TestCase {
 	public function testExecute(): void {
 		$backgroundJob = new ExpireActivities(