@@ -162,7 +162,7 @@ |
||
162 | 162 | /** |
163 | 163 | * @param array $data |
164 | 164 | * @param Form $form |
165 | - * @return HTTPResponse |
|
165 | + * @return \SilverStripe\Control\HTTPResponse |
|
166 | 166 | */ |
167 | 167 | public function createjob($data, Form $form) |
168 | 168 | { |
@@ -263,7 +263,7 @@ |
||
263 | 263 | } |
264 | 264 | |
265 | 265 | /** |
266 | - * @return FieldList |
|
266 | + * @return \SilverStripe\Forms\FieldList |
|
267 | 267 | */ |
268 | 268 | public function getCMSFields() |
269 | 269 | { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * Which columns are handled by this component |
105 | 105 | * |
106 | 106 | * @param GridField $gridField |
107 | - * @return array |
|
107 | + * @return string[] |
|
108 | 108 | */ |
109 | 109 | public function getColumnsHandled($gridField) |
110 | 110 | { |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * Which GridField actions are this component handling |
116 | 116 | * |
117 | 117 | * @param GridField $gridField |
118 | - * @return array |
|
118 | + * @return string[] |
|
119 | 119 | */ |
120 | 120 | public function getActions($gridField) |
121 | 121 | { |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @param GridField $gridField |
127 | 127 | * @param DataObject $record |
128 | 128 | * @param string $columnName |
129 | - * @return string|void - the HTML for the column |
|
129 | + * @return null|\SilverStripe\ORM\FieldType\DBHTMLText - the HTML for the column |
|
130 | 130 | */ |
131 | 131 | public function getColumnContent($gridField, $record, $columnName) |
132 | 132 | { |
@@ -58,7 +58,7 @@ |
||
58 | 58 | |
59 | 59 | /** |
60 | 60 | * Required because we aren't extending object |
61 | - * @return Config_ForClass |
|
61 | + * @return \SilverStripe\Core\Config\Config_ForClass |
|
62 | 62 | */ |
63 | 63 | public function config() |
64 | 64 | { |
@@ -6,12 +6,10 @@ |
||
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\Injector; |
14 | -use SilverStripe\Dev\SapphireTest; |
|
15 | 13 | use SilverStripe\ORM\DataList; |
16 | 14 | use SilverStripe\ORM\DataObject; |
17 | 15 | use SilverStripe\ORM\DB; |
@@ -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 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\ClassInfo; |
6 | 6 | use SilverStripe\Dev\BuildTask; |
7 | -use Symbiote\QueuedJobs\Services\AbstractQueuedJob; |
|
8 | 7 | use Symbiote\QueuedJobs\Services\QueuedJobService; |
9 | 8 | |
10 | 9 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
33 | - * @return array List of rules |
|
33 | + * @return string List of rules |
|
34 | 34 | */ |
35 | 35 | public function getDefaultRules() |
36 | 36 | { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | |
80 | 80 | /** |
81 | 81 | * @param string $queue |
82 | - * @return null|QueuedJobDescriptor |
|
82 | + * @return \SilverStripe\ORM\DataObject|null |
|
83 | 83 | */ |
84 | 84 | protected function getNextJobDescriptorWithoutMutex($queue) |
85 | 85 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Symbiote\QueuedJobs\Tasks\Engines; |
4 | 4 | |
5 | -use AsyncPHP\Doorman\Rule; |
|
6 | 5 | use SilverStripe\ORM\FieldType\DBDatetime; |
7 | 6 | use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor; |
8 | 7 | use Symbiote\QueuedJobs\Jobs\DoormanQueuedJobTask; |
@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Symbiote\QueuedJobs\Tasks; |
4 | 4 | |
5 | -use AsyncPHP\Doorman\Handler; |
|
6 | -use AsyncPHP\Doorman\Task; |
|
7 | 5 | use SilverStripe\Dev\BuildTask; |
8 | 6 | |
9 | 7 | class ProcessJobQueueChildTask extends BuildTask |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Symbiote\QueuedJobs\Tests; |
4 | 4 | |
5 | -use SilverStripe\Dev\SapphireTest; |
|
6 | 5 | use SilverStripe\Core\Config\Config; |
7 | 6 | use SilverStripe\ORM\FieldType\DBDatetime; |
8 | 7 | use Symbiote\QueuedJobs\Jobs\CleanupJob; |