1 files changed, 20 insertions, 33 deletions

diff --git a/apps/comments/tests/Unit/EventHandlerTest.php b/apps/comments/tests/Unit/EventHandlerTest.php
index 83ce1af57da..9d26f828d70 100644
--- a/apps/comments/tests/Unit/EventHandlerTest.php
+++ b/apps/comments/tests/Unit/EventHandlerTest.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -10,43 +13,32 @@ use OCA\Comments\Listener\CommentsEventListener;
 use OCA\Comments\Notification\Listener as NotificationListener;
 use OCP\Comments\CommentsEvent;
 use OCP\Comments\IComment;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class EventHandlerTest extends TestCase {
-	/** @var CommentsEventListener */
-	protected $eventHandler;
-
-	/** @var ActivityListener|\PHPUnit\Framework\MockObject\MockObject */
-	protected $activityListener;
-
-	/** @var NotificationListener|\PHPUnit\Framework\MockObject\MockObject */
-	protected $notificationListener;
+	protected ActivityListener&MockObject $activityListener;
+	protected NotificationListener&MockObject $notificationListener;
+	protected CommentsEventListener $eventHandler;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->activityListener = $this->getMockBuilder(ActivityListener::class)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->notificationListener = $this->getMockBuilder(NotificationListener::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->activityListener = $this->createMock(ActivityListener::class);
+		$this->notificationListener = $this->createMock(NotificationListener::class);
 
 		$this->eventHandler = new CommentsEventListener($this->activityListener, $this->notificationListener);
 	}
 
 	public function testNotFiles(): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->once())
 			->method('getObjectType')
 			->willReturn('smiles');
 
-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->once())
 			->method('getComment')
 			->willReturn($comment);
@@ -56,7 +48,7 @@ class EventHandlerTest extends TestCase {
 		$this->eventHandler->handle($event);
 	}
 
-	public function handledProvider() {
+	public static function handledProvider(): array {
 		return [
 			[CommentsEvent::EVENT_DELETE],
 			[CommentsEvent::EVENT_UPDATE],
@@ -65,21 +57,16 @@ class EventHandlerTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider handledProvider
-	 * @param string $eventType
-	 */
-	public function testHandled($eventType): void {
-		/** @var IComment|\PHPUnit\Framework\MockObject\MockObject $comment */
-		$comment = $this->getMockBuilder(IComment::class)->getMock();
+	#[\PHPUnit\Framework\Attributes\DataProvider('handledProvider')]
+	public function testHandled(string $eventType): void {
+		/** @var IComment|MockObject $comment */
+		$comment = $this->createMock(IComment::class);
 		$comment->expects($this->once())
 			->method('getObjectType')
 			->willReturn('files');
 
-		/** @var CommentsEvent|\PHPUnit\Framework\MockObject\MockObject $event */
-		$event = $this->getMockBuilder(CommentsEvent::class)
-			->disableOriginalConstructor()
-			->getMock();
+		/** @var CommentsEvent|MockObject $event */
+		$event = $this->createMock(CommentsEvent::class);
 		$event->expects($this->atLeastOnce())
 			->method('getComment')
 			->willReturn($comment);