@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * |
147 | 147 | * @param QueuedJob $job |
148 | 148 | * The job to start. |
149 | - * @param $startAfter |
|
149 | + * @param string $startAfter |
|
150 | 150 | * The date (in Y-m-d H:i:s format) to start execution after |
151 | 151 | * @param int $userId |
152 | 152 | * The ID of a user to execute the job as. Defaults to the current user |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | /** |
196 | 196 | * Start a job (or however the queue handler determines it should be started) |
197 | 197 | * |
198 | - * @param JobDescriptor $jobDescriptor |
|
198 | + * @param QueuedJobDescriptor $jobDescriptor |
|
199 | 199 | * @param date $startAfter |
200 | 200 | */ |
201 | 201 | public function startJob($jobDescriptor, $startAfter = null) |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * Copies data from a job into a descriptor for persisting |
213 | 213 | * |
214 | 214 | * @param QueuedJob $job |
215 | - * @param JobDescriptor $jobDescriptor |
|
215 | + * @param DataObject $jobDescriptor |
|
216 | 216 | */ |
217 | 217 | protected function copyJobToDescriptor($job, $jobDescriptor) |
218 | 218 | { |
@@ -365,6 +365,7 @@ discard block |
||
365 | 365 | |
366 | 366 | /** |
367 | 367 | * Checks through ll the scheduled jobs that are expected to exist |
368 | + * @param string $queue |
|
368 | 369 | */ |
369 | 370 | public function checkDefaultJobs($queue = null) |
370 | 371 | { |
@@ -419,7 +420,7 @@ discard block |
||
419 | 420 | * Attempt to restart a stalled job |
420 | 421 | * |
421 | 422 | * @param QueuedJobDescriptor $stalledJob |
422 | - * @return bool True if the job was successfully restarted |
|
423 | + * @return boolean|null True if the job was successfully restarted |
|
423 | 424 | */ |
424 | 425 | protected function restartStalledJob($stalledJob) |
425 | 426 | { |
@@ -889,6 +890,9 @@ discard block |
||
889 | 890 | } |
890 | 891 | } |
891 | 892 | |
893 | + /** |
|
894 | + * @param double $size |
|
895 | + */ |
|
892 | 896 | protected function humanReadable($size) |
893 | 897 | { |
894 | 898 | $filesizename = array(" Bytes", " KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"); |
@@ -904,7 +908,7 @@ discard block |
||
904 | 908 | * @param int $includeUpUntil |
905 | 909 | * The number of seconds to include jobs that have just finished, allowing a job list to be built that |
906 | 910 | * includes recently finished jobs |
907 | - * @return QueuedJobDescriptor |
|
911 | + * @return DataList |
|
908 | 912 | */ |
909 | 913 | public function getJobList($type = null, $includeUpUntil = 0) |
910 | 914 | { |
@@ -6,13 +6,11 @@ |
||
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\Injector\Injectable; |
14 | 13 | use SilverStripe\Core\Injector\Injector; |
15 | -use SilverStripe\Dev\SapphireTest; |
|
16 | 14 | use SilverStripe\ORM\DataList; |
17 | 15 | use SilverStripe\ORM\DataObject; |
18 | 16 | use SilverStripe\ORM\DB; |