fix: Replace deprecated function calls and private with public API

Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Jan 17, 2024 · c8248b0 · c8248b0
1 parent 0c829fc
commit c8248b0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/lib/BackgroundJob/DigestMail.php b/lib/BackgroundJob/DigestMail.php
@@ -23,9 +23,9 @@
 
 namespace OCA\Activity\BackgroundJob;
 
-use OC\BackgroundJob\TimedJob;
 use OCA\Activity\DigestSender;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 
 class DigestMail extends TimedJob {
 	/** @var DigestSender */

diff --git a/lib/BackgroundJob/EmailNotification.php b/lib/BackgroundJob/EmailNotification.php
@@ -23,28 +23,26 @@
 
 namespace OCA\Activity\BackgroundJob;
 
-use OC\BackgroundJob\TimedJob;
 use OCA\Activity\MailQueueHandler;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 
 /**
  * Class EmailNotification
  *
  * @package OCA\Activity\BackgroundJob
  */
 class EmailNotification extends TimedJob {
-	/** @var MailQueueHandler */
-	protected $queueHandler;
 
-	/** @var bool */
-	protected $isCLI;
+	public function __construct(
+		ITimeFactory $time,
+		protected MailQueueHandler $queueHandler,
+		protected bool $isCLI,
+	) {
+		parent::__construct($time);
 
-	public function __construct(MailQueueHandler $mailQueueHandler,
-		bool $isCLI) {
 		// Run everytime cron is executed, so the batching doesn't delay too much
 		$this->setInterval(1);
-
-		$this->queueHandler = $mailQueueHandler;
-		$this->isCLI = $isCLI;
 	}
 
 	protected function run($argument) {

diff --git a/lib/BackgroundJob/RemoteActivity.php b/lib/BackgroundJob/RemoteActivity.php
@@ -22,8 +22,8 @@
 namespace OCA\Activity\BackgroundJob;
 
 use GuzzleHttp\Exception\ClientException;
-use OC\BackgroundJob\QueuedJob;
 use OCA\Activity\Extension\Files;
+use OCP\BackgroundJob\QueuedJob;
 use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
 use OCP\Http\Client\IClientService;
@@ -40,8 +40,8 @@ public function __construct(IClientService $clientService, ICloudIdManager $clou
 		$this->cloudIdManager = $cloudIdManager;
 	}
 
-	protected function run($arguments) {
-		call_user_func_array([$this, 'sendActivity'], $arguments);
+	protected function run($argument) {
+		call_user_func_array([$this, 'sendActivity'], $argument);
 	}
 
 	protected function sendActivity($target, $token, $path, $internalType, $time, $actor, $secondPath = '') {

diff --git a/lib/Controller/APIv1Controller.php b/lib/Controller/APIv1Controller.php
@@ -27,6 +27,7 @@
 use OCA\Activity\UserSettings;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
+use OCP\IDBConnection;
 use OCP\IRequest;
 
 class APIv1Controller extends OCSController {
@@ -43,7 +44,9 @@ public function __construct($appName,
 		protected Data $data,
 		protected GroupHelper $groupHelper,
 		protected UserSettings $userSettings,
-		protected CurrentUser $currentUser) {
+		protected CurrentUser $currentUser,
+		protected IDBConnection $dbConnection,
+	) {
 		parent::__construct($appName, $request);
 	}
 
@@ -85,15 +88,15 @@ public function get($start = 0, $count = 30) {
 	 * @return int
 	 */
 	protected function getSinceFromOffset($offset) {
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$query = $this->dbConnection->getQueryBuilder();
 		$query->select('activity_id')
 			->from('activity')
 			->where($query->expr()->eq('affecteduser', $query->createNamedParameter($this->currentUser->getUID())))
 			->orderBy('activity_id', 'desc')
 			->setFirstResult($offset - 1)
 			->setMaxResults(1);
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$row = $result->fetch();
 		$result->closeCursor();
 

diff --git a/lib/Controller/RemoteActivityController.php b/lib/Controller/RemoteActivityController.php
@@ -94,7 +94,7 @@ public function receiveActivity($token, array $to, array $actor, $type, $updated
 			->where($query->expr()->eq('share_token', $query->createNamedParameter($token)))
 			->andWhere($query->expr()->eq('user', $query->createNamedParameter($user->getUID())));
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$share = $result->fetch();
 		$result->closeCursor();
 

diff --git a/lib/Data.php b/lib/Data.php
@@ -237,7 +237,7 @@ public function get(GroupHelper $groupHelper, UserSettings $userSettings, $user,
 
 		$query->setMaxResults($limit + 1);
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		$hasMore = false;
 		while ($row = $result->fetch()) {
 			if ($limit === 0) {
@@ -273,7 +273,7 @@ protected function setOffsetFromSince(IQueryBuilder $query, $user, $since, $sort
 			$queryBuilder->select(['affecteduser', 'timestamp'])
 				->from('activity')
 				->where($queryBuilder->expr()->eq('activity_id', $queryBuilder->createNamedParameter((int)$since)));
-			$result = $queryBuilder->execute();
+			$result = $queryBuilder->executeQuery();
 			$activity = $result->fetch();
 			$result->closeCursor();
 
@@ -303,7 +303,7 @@ protected function setOffsetFromSince(IQueryBuilder $query, $user, $since, $sort
 			->where($fetchQuery->expr()->eq('affecteduser', $fetchQuery->createNamedParameter($user)))
 			->orderBy('timestamp', $sort)
 			->setMaxResults(1);
-		$result = $fetchQuery->execute();
+		$result = $fetchQuery->executeQuery();
 		$activity = $result->fetch();
 		$result->closeCursor();
 
@@ -393,7 +393,7 @@ public function getById(int $activityId): ?IEvent {
 			->from('activity')
 			->where($query->expr()->eq('activity_id', $query->createNamedParameter($activityId)));
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 		if ($row = $result->fetch()) {
 			$event = $this->activityManager->generateEvent();
 			$event->setApp((string)$row['app'])
@@ -428,7 +428,7 @@ public function getFirstActivitySince(string $user, int $timestamp): int {
 			->orderBy('timestamp', 'ASC')
 			->setMaxResults(1);
 
-		$res = $query->execute()->fetch(\PDO::FETCH_COLUMN);
+		$res = $query->executeQuery()->fetch(\PDO::FETCH_COLUMN);
 		return (int)$res;
 	}
 
@@ -453,7 +453,7 @@ public function getActivitySince(string $user, int $since, bool $byOthers) {
 			$query->andWhere($query->expr()->neq('user', $nameParam));
 		}
 
-		return $query->execute()->fetch();
+		return $query->executeQuery()->fetch();
 	}
 
 	/**

diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php
@@ -188,7 +188,7 @@ protected function getAffectedUsers($limit, $latestSend, $forceSending, $restric
 			}
 		}
 
-		$result = $query->execute();
+		$result = $query->executeQuery();
 
 		$affectedUsers = [];
 		while ($row = $result->fetch()) {
@@ -215,7 +215,7 @@ protected function getItemsForUser($affectedUser, $maxTime, $maxNumItems = self:
 			->andWhere($query->expr()->eq('amq_affecteduser', $query->createNamedParameter($affectedUser)))
 			->orderBy('amq_timestamp', 'ASC')
 			->setMaxResults($maxNumItems);
-		$result = $query->execute();
+		$result = $query->executeQuery();
 
 		$activities = [];
 		while ($row = $result->fetch()) {
@@ -230,7 +230,7 @@ protected function getItemsForUser($affectedUser, $maxTime, $maxNumItems = self:
 				->from('activity_mq')
 				->where($query->expr()->lte('amq_timestamp', $query->createNamedParameter($maxTime)))
 				->andWhere($query->expr()->eq('amq_affecteduser', $query->createNamedParameter($affectedUser)));
-			$result = $query->execute();
+			$result = $query->executeQuery();
 			$row = $result->fetch();
 			$result->closeCursor();
 
@@ -492,6 +492,6 @@ protected function deleteSentItems(array $affectedUsers, $maxTime) {
 		$query->delete('activity_mq')
 			->where($query->expr()->lte('amq_timestamp', $query->createNamedParameter($maxTime, IQueryBuilder::PARAM_INT)))
 			->andWhere($query->expr()->in('amq_affecteduser', $query->createNamedParameter($affectedUsers, IQueryBuilder::PARAM_STR_ARRAY), IQueryBuilder::PARAM_STR));
-		$query->execute();
+		$query->executeStatement();
 	}
 }