@@ -145,7 +145,7 @@ |
||
| 145 | 145 | /** |
| 146 | 146 | * @param array $data |
| 147 | 147 | * @param Form $form |
| 148 | - * @return HTTPResponse |
|
| 148 | + * @return \SilverStripe\Control\HTTPResponse |
|
| 149 | 149 | */ |
| 150 | 150 | public function createjob($data, Form $form) |
| 151 | 151 | { |
@@ -258,7 +258,7 @@ |
||
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | /** |
| 261 | - * @return FieldList |
|
| 261 | + * @return \SilverStripe\Forms\FieldList |
|
| 262 | 262 | */ |
| 263 | 263 | public function getCMSFields() |
| 264 | 264 | { |
@@ -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 | { |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | /** |
| 184 | 184 | * Start a job (or however the queue handler determines it should be started) |
| 185 | 185 | * |
| 186 | - * @param JobDescriptor $jobDescriptor |
|
| 186 | + * @param QueuedJobDescriptor $jobDescriptor |
|
| 187 | 187 | * @param date $startAfter |
| 188 | 188 | */ |
| 189 | 189 | public function startJob($jobDescriptor, $startAfter = null) |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | * Copies data from a job into a descriptor for persisting |
| 201 | 201 | * |
| 202 | 202 | * @param QueuedJob $job |
| 203 | - * @param JobDescriptor $jobDescriptor |
|
| 203 | + * @param DataObject $jobDescriptor |
|
| 204 | 204 | */ |
| 205 | 205 | protected function copyJobToDescriptor($job, $jobDescriptor) |
| 206 | 206 | { |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | * Attempt to restart a stalled job |
| 356 | 356 | * |
| 357 | 357 | * @param QueuedJobDescriptor $stalledJob |
| 358 | - * @return bool True if the job was successfully restarted |
|
| 358 | + * @return boolean|null True if the job was successfully restarted |
|
| 359 | 359 | */ |
| 360 | 360 | protected function restartStalledJob($stalledJob) |
| 361 | 361 | { |
@@ -812,6 +812,9 @@ discard block |
||
| 812 | 812 | } |
| 813 | 813 | } |
| 814 | 814 | |
| 815 | + /** |
|
| 816 | + * @param double $size |
|
| 817 | + */ |
|
| 815 | 818 | protected function humanReadable($size) |
| 816 | 819 | { |
| 817 | 820 | $filesizename = array(" Bytes", " KB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"); |
@@ -827,7 +830,7 @@ discard block |
||
| 827 | 830 | * @param int $includeUpUntil |
| 828 | 831 | * The number of seconds to include jobs that have just finished, allowing a job list to be built that |
| 829 | 832 | * includes recently finished jobs |
| 830 | - * @return QueuedJobDescriptor |
|
| 833 | + * @return DataList |
|
| 831 | 834 | */ |
| 832 | 835 | public function getJobList($type = null, $includeUpUntil = 0) |
| 833 | 836 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | - * @return array List of rules |
|
| 34 | + * @return string List of rules |
|
| 35 | 35 | */ |
| 36 | 36 | public function getDefaultRules() |
| 37 | 37 | { |
@@ -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 SilverStripe\QueuedJobs\Tasks\Engines; |
| 4 | 4 | |
| 5 | -use AsyncPHP\Doorman\Rule; |
|
| 6 | 5 | use SilverStripe\ORM\FieldType\DBDatetime; |
| 7 | 6 | use SilverStripe\QueuedJobs\DataObjects\QueuedJobDescriptor; |
| 8 | 7 | use SilverStripe\QueuedJobs\Jobs\DoormanQueuedJobTask; |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\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 |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | - * @param FieldSet $fields |
|
| 51 | + * @param FieldList $fields |
|
| 52 | 52 | */ |
| 53 | 53 | public function updateCMSFields(FieldList $fields) |
| 54 | 54 | { |
@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use SilverStripe\Dev\SapphireTest; |
| 4 | -use SilverStripe\Dev\TestOnly; |
|
| 5 | 4 | use SilverStripe\ORM\DataObject; |
| 6 | 5 | |
| 7 | 6 | /** |