@@ -182,7 +182,7 @@ discard block  | 
                                                    ||
| 182 | 182 | * Get the commenting option for the current state  | 
                                                        
| 183 | 183 | *  | 
                                                        
| 184 | 184 | * @param string $key  | 
                                                        
| 185 | - * @return mixed Result if the setting is available, or null otherwise  | 
                                                        |
| 185 | + * @return integer Result if the setting is available, or null otherwise  | 
                                                        |
| 186 | 186 | */  | 
                                                        
| 187 | 187 | public function getOption($key)  | 
                                                        
| 188 | 188 |      { | 
                                                        
@@ -216,7 +216,7 @@ discard block  | 
                                                    ||
| 216 | 216 | /**  | 
                                                        
| 217 | 217 | * Outputs the RSS feed of comments  | 
                                                        
| 218 | 218 | *  | 
                                                        
| 219 | - * @return HTMLText  | 
                                                        |
| 219 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText  | 
                                                        |
| 220 | 220 | */  | 
                                                        
| 221 | 221 | public function rss()  | 
                                                        
| 222 | 222 |      { | 
                                                        
@@ -365,6 +365,7 @@ discard block  | 
                                                    ||
| 365 | 365 | * Redirect back to referer if available, ensuring that only site URLs  | 
                                                        
| 366 | 366 | * are allowed to avoid phishing. If it's an AJAX request render the  | 
                                                        
| 367 | 367 | * comment in it's new state  | 
                                                        
| 368 | + * @param DataObject $comment  | 
                                                        |
| 368 | 369 | */  | 
                                                        
| 369 | 370 | private function renderChangedCommentState($comment)  | 
                                                        
| 370 | 371 |      { | 
                                                        
@@ -275,7 +275,7 @@ discard block  | 
                                                    ||
| 275 | 275 | /**  | 
                                                        
| 276 | 276 | * Returns the root level comments, with spam and unmoderated items excluded, for use in the frontend  | 
                                                        
| 277 | 277 | *  | 
                                                        
| 278 | - * @return DataList  | 
                                                        |
| 278 | + * @return \SilverStripe\ORM\SS_List  | 
                                                        |
| 279 | 279 | */  | 
                                                        
| 280 | 280 | public function Comments()  | 
                                                        
| 281 | 281 |      { | 
                                                        
@@ -389,7 +389,7 @@ discard block  | 
                                                    ||
| 389 | 389 | *  | 
                                                        
| 390 | 390 | * @param Member $member  | 
                                                        
| 391 | 391 | *  | 
                                                        
| 392 | - * @return boolean  | 
                                                        |
| 392 | + * @return boolean|string  | 
                                                        |
| 393 | 393 | */  | 
                                                        
| 394 | 394 | public function canModerateComments($member = null)  | 
                                                        
| 395 | 395 |      { | 
                                                        
@@ -17,7 +17,7 @@  | 
                                                    ||
| 17 | 17 | private $secret = null;  | 
                                                        
| 18 | 18 | |
| 19 | 19 | /**  | 
                                                        
| 20 | - * @param Comment $comment Comment to generate this token for  | 
                                                        |
| 20 | + * @param \SilverStripe\ORM\DataObject|null $comment Comment to generate this token for  | 
                                                        |
| 21 | 21 | */  | 
                                                        
| 22 | 22 | public function __construct($comment)  | 
                                                        
| 23 | 23 |      { | 
                                                        
@@ -1282,6 +1282,9 @@  | 
                                                    ||
| 1282 | 1282 |          $this->markTestSkipped('TODO'); | 
                                                        
| 1283 | 1283 | }  | 
                                                        
| 1284 | 1284 | |
| 1285 | + /**  | 
                                                        |
| 1286 | + * @param string $name  | 
                                                        |
| 1287 | + */  | 
                                                        |
| 1285 | 1288 | protected static function getMethod($name)  | 
                                                        
| 1286 | 1289 |      { | 
                                                        
| 1287 | 1290 | $class = new ReflectionClass(Comment::class);  | 
                                                        
@@ -265,7 +265,7 @@ discard block  | 
                                                    ||
| 265 | 265 | *  | 
                                                        
| 266 | 266 | * @param string $key  | 
                                                        
| 267 | 267 | *  | 
                                                        
| 268 | - * @return mixed Result if the setting is available, or null otherwise  | 
                                                        |
| 268 | + * @return integer Result if the setting is available, or null otherwise  | 
                                                        |
| 269 | 269 | */  | 
                                                        
| 270 | 270 | public function getOption($key)  | 
                                                        
| 271 | 271 |      { | 
                                                        
@@ -397,7 +397,7 @@ discard block  | 
                                                    ||
| 397 | 397 | /**  | 
                                                        
| 398 | 398 | * Checks if the comment can be edited.  | 
                                                        
| 399 | 399 | *  | 
                                                        
| 400 | - * @param null|int|Member $member  | 
                                                        |
| 400 | + * @param DataObject|null $member  | 
                                                        |
| 401 | 401 | * @return Boolean  | 
                                                        
| 402 | 402 | */  | 
                                                        
| 403 | 403 | public function canEdit($member = null)  | 
                                                        
@@ -427,7 +427,7 @@ discard block  | 
                                                    ||
| 427 | 427 | /**  | 
                                                        
| 428 | 428 | * Checks if the comment can be deleted.  | 
                                                        
| 429 | 429 | *  | 
                                                        
| 430 | - * @param null|int|Member $member  | 
                                                        |
| 430 | + * @param Member|null $member  | 
                                                        |
| 431 | 431 | * @return Boolean  | 
                                                        
| 432 | 432 | */  | 
                                                        
| 433 | 433 | public function canDelete($member = null)  | 
                                                        
@@ -450,7 +450,7 @@ discard block  | 
                                                    ||
| 450 | 450 | * Resolves Member object.  | 
                                                        
| 451 | 451 | *  | 
                                                        
| 452 | 452 | * @param Member|int|null $member  | 
                                                        
| 453 | - * @return Member|null  | 
                                                        |
| 453 | + * @return DataObject|null  | 
                                                        |
| 454 | 454 | */  | 
                                                        
| 455 | 455 | protected function getMember($member = null)  | 
                                                        
| 456 | 456 |      { | 
                                                        
@@ -816,7 +816,7 @@ discard block  | 
                                                    ||
| 816 | 816 | /**  | 
                                                        
| 817 | 817 | * Returns the list of replies, with spam and unmoderated items excluded, for use in the frontend  | 
                                                        
| 818 | 818 | *  | 
                                                        
| 819 | - * @return SS_List  | 
                                                        |
| 819 | + * @return \SilverStripe\ORM\SS_List  | 
                                                        |
| 820 | 820 | */  | 
                                                        
| 821 | 821 | public function Replies()  | 
                                                        
| 822 | 822 |      { | 
                                                        
@@ -867,7 +867,7 @@ discard block  | 
                                                    ||
| 867 | 867 | /**  | 
                                                        
| 868 | 868 | * Generate a reply form for this comment  | 
                                                        
| 869 | 869 | *  | 
                                                        
| 870 | - * @return Form  | 
                                                        |
| 870 | + * @return null|\SilverStripe\Comments\Controllers\Form  | 
                                                        |
| 871 | 871 | */  | 
                                                        
| 872 | 872 | public function ReplyForm()  | 
                                                        
| 873 | 873 |      { | 
                                                        
@@ -157,7 +157,7 @@ discard block  | 
                                                    ||
| 157 | 157 | /**  | 
                                                        
| 158 | 158 | * @param array $data  | 
                                                        
| 159 | 159 | * @param Form $form  | 
                                                        
| 160 | - * @return HTTPResponse  | 
                                                        |
| 160 | + * @return \SilverStripe\Control\HTTPResponse  | 
                                                        |
| 161 | 161 | */  | 
                                                        
| 162 | 162 | public function doPreviewComment($data, $form)  | 
                                                        
| 163 | 163 |      { | 
                                                        
@@ -171,7 +171,7 @@ discard block  | 
                                                    ||
| 171 | 171 | *  | 
                                                        
| 172 | 172 | * @param array $data  | 
                                                        
| 173 | 173 | * @param Form $form  | 
                                                        
| 174 | - * @return HTTPResponse  | 
                                                        |
| 174 | + * @return \SilverStripe\Control\HTTPResponse  | 
                                                        |
| 175 | 175 | */  | 
                                                        
| 176 | 176 | public function doPostComment($data, $form)  | 
                                                        
| 177 | 177 |      { |