diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-06-27 11:53:10 +0200 |
|---|---|---|
| committer | Côme Chilliet (Rebase PR Action) <come-nc@users.noreply.github.com> | 2022-07-11 09:46:23 +0000 |
| commit | 868d748dbfa51461b5ee7cc827be6f314ae0959d (patch) | |
| tree | eb5f33d57e2185c47c8d344e6b45d57dd189b93d /lib | |
| parent | 3d0117990749bebe5394ff664d62494ae9a6fa1e (diff) | |
| download | nextcloud-server-868d748dbfa51461b5ee7cc827be6f314ae0959d.tar.gz nextcloud-server-868d748dbfa51461b5ee7cc827be6f314ae0959d.zip | |
Code cleaning of Background/ListCommand
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/BackgroundJob/JobList.php | 9 | ||||
| -rw-r--r-- | lib/public/BackgroundJob/IJobList.php | 18 |
2 files changed, 15 insertions, 12 deletions
diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 8ba993646a9..82e8e86c5c6 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -40,7 +40,6 @@ use OCP\IConfig; use OCP\IDBConnection; class JobList implements IJobList { - protected IDBConnection $connection; protected IConfig $config; protected ITimeFactory $timeFactory; @@ -163,12 +162,16 @@ class JobList implements IJobList { * * @return IJob[] * @deprecated 9.0.0 - This method is dangerous since it can cause load and - * memory problems when creating too many instances. + * memory problems when creating too many instances. Use getJobs instead. */ public function getAll() { return $this->getJobs(null, null, 0); } + /** + * @param IJob|class-string<IJob>|null $job + * @return IJob[] + */ public function getJobs($job, ?int $limit, int $offset): array { $query = $this->connection->getQueryBuilder(); $query->select('*') @@ -297,7 +300,7 @@ class JobList implements IJobList { try { // Try to load the job as a service /** @var IJob $job */ - $job = \OC::$server->get($row['class']); + $job = \OCP\Server::get($row['class']); } catch (QueryException $e) { if (class_exists($row['class'])) { $class = $row['class']; diff --git a/lib/public/BackgroundJob/IJobList.php b/lib/public/BackgroundJob/IJobList.php index 7bc7420f35b..e2fd5b87bcb 100644 --- a/lib/public/BackgroundJob/IJobList.php +++ b/lib/public/BackgroundJob/IJobList.php @@ -47,7 +47,7 @@ interface IJobList { /** * Add a job to the list * - * @param \OCP\BackgroundJob\IJob|string $job + * @param IJob|string $job * @param mixed $argument The argument to be passed to $job->run() when the job is exectured * @since 7.0.0 */ @@ -56,7 +56,7 @@ interface IJobList { /** * Remove a job from the list * - * @param \OCP\BackgroundJob\IJob|string $job + * @param IJob|string $job * @param mixed $argument * @since 7.0.0 */ @@ -65,7 +65,7 @@ interface IJobList { /** * check if a job is in the list * - * @param \OCP\BackgroundJob\IJob|string $job + * @param IJob|string $job * @param mixed $argument * @return bool * @since 7.0.0 @@ -75,18 +75,18 @@ interface IJobList { /** * get all jobs in the list * - * @return \OCP\BackgroundJob\IJob[] + * @return IJob[] * @since 7.0.0 * @deprecated 9.0.0 - This method is dangerous since it can cause load and - * memory problems when creating too many instances. + * memory problems when creating too many instances. Use getJobs instead. */ public function getAll(); /** * Get jobs matching the search * - * @param \OCP\BackgroundJob\IJob|class-string<IJob>|null $job - * @return \OCP\BackgroundJob\IJob[] + * @param IJob|class-string<IJob>|null $job + * @return IJob[] * @since 25.0.0 */ public function getJobs($job, ?int $limit, int $offset): array; @@ -95,14 +95,14 @@ interface IJobList { * get the next job in the list * * @param bool $onlyTimeSensitive - * @return \OCP\BackgroundJob\IJob|null + * @return IJob|null * @since 7.0.0 - In 24.0.0 parameter $onlyTimeSensitive got added */ public function getNext(bool $onlyTimeSensitive = false): ?IJob; /** * @param int $id - * @return \OCP\BackgroundJob\IJob|null + * @return IJob|null * @since 7.0.0 */ public function getById($id); |