Merge pull request #1090 from nextcloud/fix/remove-oc-backgroundjob-use

chore: Migrate to OCP version of QueuedJob
nextcloud · Feb 13, 2024 · 970f0b0 · 970f0b0
2 parents f36f3e4 + 63a35bc
commit 970f0b0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/lib/Notification/BackgroundJob.php b/lib/Notification/BackgroundJob.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2016 Joas Schilling <[email protected]>
  *
@@ -21,25 +24,21 @@
 
 namespace OCA\FirstRunWizard\Notification;
 
-use OC\BackgroundJob\QueuedJob;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\QueuedJob;
 use OCP\Notification\IManager as INotificationManager;
 
 class BackgroundJob extends QueuedJob {
-
-	/** @var INotificationManager */
-	protected $notificationManager;
-
-	/**
-	 * BackgroundJob constructor.
-	 *
-	 * @param INotificationManager $notificationManager
-	 */
-	public function __construct(INotificationManager $notificationManager) {
-		$this->notificationManager = $notificationManager;
+	public function __construct(
+		ITimeFactory $time,
+		protected INotificationManager $notificationManager,
+	) {
+		parent::__construct($time);
 	}
 
 	/**
 	 * @param array $argument
+	 * @return void
 	 */
 	protected function run($argument) {
 		$notification = $this->notificationManager->createNotification();
@@ -49,7 +48,7 @@ protected function run($argument) {
 			->setUser($argument['uid']);
 
 		if ($this->notificationManager->getCount($notification) === 0) {
-			$notification->setDateTime(new \DateTime());
+			$notification->setDateTime($this->time->getDateTime());
 			$this->notificationManager->notify($notification);
 		}
 	}

diff --git a/tests/Notification/BackgroundJobTest.php b/tests/Notification/BackgroundJobTest.php
@@ -24,6 +24,7 @@
 namespace OCA\FirstRunWizard\Tests\Notification;
 
 use OCA\FirstRunWizard\Notification\BackgroundJob;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Notification\IManager;
 use OCP\Notification\INotification;
 use Test\TestCase;
@@ -35,17 +36,17 @@
  * @group DB
  */
 class BackgroundJobTest extends TestCase {
-	/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
-	protected $notificationManager;
-
-	/** @var BackgroundJob */
-	protected $job;
+	protected ITimeFactory $timeFactory;
+	protected IManager $notificationManager;
+	protected BackgroundJob $job;
 
 	protected function setUp(): void {
 		parent::setUp();
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
 		$this->notificationManager = $this->createMock(IManager::class);
 		$this->job = new BackgroundJob(
-			$this->notificationManager
+			$this->timeFactory,
+			$this->notificationManager,
 		);
 	}