@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * |
152 | 152 | * @param QueuedJob $job |
153 | 153 | * The job to start. |
154 | - * @param $startAfter |
|
154 | + * @param string $startAfter |
|
155 | 155 | * The date (in Y-m-d H:i:s format) to start execution after |
156 | 156 | * @param int $userId |
157 | 157 | * The ID of a user to execute the job as. Defaults to the current user |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | /** |
201 | 201 | * Start a job (or however the queue handler determines it should be started) |
202 | 202 | * |
203 | - * @param JobDescriptor $jobDescriptor |
|
203 | + * @param QueuedJobDescriptor $jobDescriptor |
|
204 | 204 | * @param date $startAfter |
205 | 205 | */ |
206 | 206 | public function startJob($jobDescriptor, $startAfter = null) |
@@ -370,6 +370,7 @@ discard block |
||
370 | 370 | |
371 | 371 | /** |
372 | 372 | * Checks through ll the scheduled jobs that are expected to exist |
373 | + * @param string $queue |
|
373 | 374 | */ |
374 | 375 | public function checkDefaultJobs($queue = null) |
375 | 376 | { |
@@ -425,7 +426,7 @@ discard block |
||
425 | 426 | * Attempt to restart a stalled job |
426 | 427 | * |
427 | 428 | * @param QueuedJobDescriptor $stalledJob |
428 | - * @return bool True if the job was successfully restarted |
|
429 | + * @return boolean|null True if the job was successfully restarted |
|
429 | 430 | */ |
430 | 431 | protected function restartStalledJob($stalledJob) |
431 | 432 | { |
@@ -894,6 +895,9 @@ discard block |
||
894 | 895 | } |
895 | 896 | } |
896 | 897 | |
898 | + /** |
|
899 | + * @param double $size |
|
900 | + */ |
|
897 | 901 | protected function humanReadable($size) |
898 | 902 | { |
899 | 903 | $filesizename = array(" Bytes", " KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"); |
@@ -909,7 +913,7 @@ discard block |
||
909 | 913 | * @param int $includeUpUntil |
910 | 914 | * The number of seconds to include jobs that have just finished, allowing a job list to be built that |
911 | 915 | * includes recently finished jobs |
912 | - * @return QueuedJobDescriptor |
|
916 | + * @return DataList |
|
913 | 917 | */ |
914 | 918 | public function getJobList($type = null, $includeUpUntil = 0) |
915 | 919 | { |
@@ -6,14 +6,12 @@ |
||
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; |