diff options
author | Gary Kim <gary@garykim.dev> | 2020-08-14 05:10:53 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-14 05:10:53 +0300 |
commit | 5559570fafcedf2db709dd9ee1e82acad85e60df (patch) | |
tree | 41fc3f4c6c8e1e91fc5fb3a8d1688dbb759d5569 | |
parent | 75c659cfbc7041b7f9163181f66aa73bf08308fa (diff) | |
parent | 16d83ab30a60c2a6a4cd71c1127dbc8dece7e136 (diff) |
Merge pull request #22242 from nextcloud/techdebt/noid/remove-deprecated-methods
Remove deprecated and unused method calls
-rw-r--r-- | apps/files_external/lib/Lib/FrontendDefinitionTrait.php | 10 | ||||
-rw-r--r-- | lib/private/BackgroundJob/JobList.php | 12 | ||||
-rw-r--r-- | lib/public/BackgroundJob/IJobList.php | 11 | ||||
-rw-r--r-- | tests/lib/BackgroundJob/DummyJobList.php | 9 | ||||
-rw-r--r-- | tests/lib/BackgroundJob/JobListTest.php | 9 |
5 files changed, 0 insertions, 51 deletions
diff --git a/apps/files_external/lib/Lib/FrontendDefinitionTrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php index 30e0f593621..300abd15db3 100644 --- a/apps/files_external/lib/Lib/FrontendDefinitionTrait.php +++ b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php @@ -107,16 +107,6 @@ trait FrontendDefinitionTrait { } /** - * @param string $custom - * @return self - * @deprecated 9.1.0, use addCustomJs() instead - */ - public function setCustomJs($custom) { - $this->customJs = [$custom]; - return $this; - } - - /** * Serialize into JSON for client-side JS * * @return array diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 1adecb5b32d..d9d80374cfd 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -311,18 +311,6 @@ class JobList implements IJobList { } /** - * get the id of the last ran job - * - * @return int - * @deprecated 9.1.0 - The functionality behind the value is deprecated, it - * only tells you which job finished last, but since we now allow multiple - * executors to run in parallel, it's not used to calculate the next job. - */ - public function getLastJob() { - return (int) $this->config->getAppValue('backgroundjob', 'lastjob', 0); - } - - /** * set the lastRun of $job to now * * @param IJob $job diff --git a/lib/public/BackgroundJob/IJobList.php b/lib/public/BackgroundJob/IJobList.php index cf04cb21f48..eb8a2c5e3dc 100644 --- a/lib/public/BackgroundJob/IJobList.php +++ b/lib/public/BackgroundJob/IJobList.php @@ -116,17 +116,6 @@ interface IJobList { public function unlockJob(IJob $job); /** - * get the id of the last ran job - * - * @return int - * @since 7.0.0 - * @deprecated 9.1.0 - The functionality behind the value is deprecated, it - * only tells you which job finished last, but since we now allow multiple - * executors to run in parallel, it's not used to calculate the next job. - */ - public function getLastJob(); - - /** * set the lastRun of $job to now * * @param IJob $job diff --git a/tests/lib/BackgroundJob/DummyJobList.php b/tests/lib/BackgroundJob/DummyJobList.php index 529e93e960f..452b9bb98ed 100644 --- a/tests/lib/BackgroundJob/DummyJobList.php +++ b/tests/lib/BackgroundJob/DummyJobList.php @@ -118,15 +118,6 @@ class DummyJobList extends \OC\BackgroundJob\JobList { } /** - * get the id of the last ran job - * - * @return int - */ - public function getLastJob() { - return $this->last; - } - - /** * set the lastRun of $job to now * * @param IJob $job diff --git a/tests/lib/BackgroundJob/JobListTest.php b/tests/lib/BackgroundJob/JobListTest.php index 20ba1e50016..736d670ed20 100644 --- a/tests/lib/BackgroundJob/JobListTest.php +++ b/tests/lib/BackgroundJob/JobListTest.php @@ -146,15 +146,6 @@ class JobListTest extends TestCase { $this->assertFalse($this->instance->has($job, 10)); } - public function testGetLastJob() { - $this->config->expects($this->once()) - ->method('getAppValue') - ->with('backgroundjob', 'lastjob', 0) - ->willReturn(15); - - $this->assertEquals(15, $this->instance->getLastJob()); - } - protected function createTempJob($class, $argument, $reservedTime = 0, $lastChecked = 0) { if ($lastChecked === 0) { $lastChecked = time(); |