@@ -6,20 +6,17 @@ |
||
6 | 6 | use SilverStripe\Control\Controller; |
7 | 7 | use SilverStripe\Control\Director; |
8 | 8 | use SilverStripe\Control\Email\Email; |
9 | -use SilverStripe\Control\Session; |
|
10 | 9 | use SilverStripe\Core\Config\Config; |
11 | 10 | use SilverStripe\Core\Config\Configurable; |
12 | 11 | use SilverStripe\Core\Convert; |
13 | 12 | use SilverStripe\Core\Extensible; |
14 | 13 | use SilverStripe\Core\Injector\Injectable; |
15 | 14 | use SilverStripe\Core\Injector\Injector; |
16 | -use SilverStripe\Dev\SapphireTest; |
|
17 | 15 | use SilverStripe\ORM\DataList; |
18 | 16 | use SilverStripe\ORM\DataObject; |
19 | 17 | use SilverStripe\ORM\DB; |
20 | 18 | use SilverStripe\ORM\FieldType\DBDatetime; |
21 | 19 | use SilverStripe\Security\Member; |
22 | -use SilverStripe\Security\Permission; |
|
23 | 20 | use SilverStripe\Security\Security; |
24 | 21 | use Psr\Log\LoggerInterface; |
25 | 22 | use SilverStripe\Subsites\Model\Subsite; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * |
153 | 153 | * @param QueuedJob $job |
154 | 154 | * The job to start. |
155 | - * @param $startAfter |
|
155 | + * @param string $startAfter |
|
156 | 156 | * The date (in Y-m-d H:i:s format) to start execution after |
157 | 157 | * @param int $userId |
158 | 158 | * The ID of a user to execute the job as. Defaults to the current user |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | /** |
209 | 209 | * Start a job (or however the queue handler determines it should be started) |
210 | 210 | * |
211 | - * @param JobDescriptor $jobDescriptor |
|
211 | + * @param QueuedJobDescriptor $jobDescriptor |
|
212 | 212 | * @param date $startAfter |
213 | 213 | */ |
214 | 214 | public function startJob($jobDescriptor, $startAfter = null) |
@@ -379,6 +379,7 @@ discard block |
||
379 | 379 | |
380 | 380 | /** |
381 | 381 | * Checks through ll the scheduled jobs that are expected to exist |
382 | + * @param string $queue |
|
382 | 383 | */ |
383 | 384 | public function checkDefaultJobs($queue = null) |
384 | 385 | { |
@@ -435,7 +436,7 @@ discard block |
||
435 | 436 | * |
436 | 437 | * @param QueuedJobDescriptor $stalledJob |
437 | 438 | * |
438 | - * @return bool True if the job was successfully restarted |
|
439 | + * @return boolean|null True if the job was successfully restarted |
|
439 | 440 | */ |
440 | 441 | protected function restartStalledJob($stalledJob) |
441 | 442 | { |
@@ -961,6 +962,9 @@ discard block |
||
961 | 962 | } |
962 | 963 | } |
963 | 964 | |
965 | + /** |
|
966 | + * @param double $size |
|
967 | + */ |
|
964 | 968 | protected function humanReadable($size) |
965 | 969 | { |
966 | 970 | $filesizename = [" Bytes", " KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"]; |
@@ -977,7 +981,7 @@ discard block |
||
977 | 981 | * The number of seconds to include jobs that have just finished, allowing a job list to be built that |
978 | 982 | * includes recently finished jobs |
979 | 983 | * |
980 | - * @return QueuedJobDescriptor |
|
984 | + * @return DataList |
|
981 | 985 | */ |
982 | 986 | public function getJobList($type = null, $includeUpUntil = 0) |
983 | 987 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Symbiote\QueuedJobs\Tests; |
4 | 4 | |
5 | -use SilverStripe\Core\Config\Config; |
|
6 | 5 | use SilverStripe\Control\HTTPRequest; |
7 | 6 | use SilverStripe\Dev\FunctionalTest; |
8 | 7 | use SilverStripe\Forms\FieldList; |
@@ -20,7 +20,7 @@ |
||
20 | 20 | class RunBuildTaskJob extends AbstractQueuedJob |
21 | 21 | { |
22 | 22 | /** |
23 | - * @param DataObject $node |
|
23 | + * @param string $queryString |
|
24 | 24 | */ |
25 | 25 | public function __construct($taskClass = null, $queryString = null) |
26 | 26 | { |