| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | * | 
| 56 | 56 | * @param GridField $gridField | 
| 57 | 57 | * | 
| 58 | - * @return array | |
| 58 | + * @return string[] | |
| 59 | 59 | */ | 
| 60 | 60 | public function getActions($gridField) | 
| 61 | 61 |      { | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | * @param $arguments mixed | 
| 73 | 73 | * @param $data array | 
| 74 | 74 | * | 
| 75 | - * @return null|SS_HTTPResponse | |
| 75 | + * @return \SilverStripe\Control\HTTPResponse|null | |
| 76 | 76 | * | 
| 77 | 77 | * @throws UnexpectedValueException | 
| 78 | 78 | */ | 
| @@ -192,6 +192,8 @@ discard block | ||
| 192 | 192 | |
| 193 | 193 | /** | 
| 194 | 194 |       * {@inheritdoc} | 
| 195 | + * @param Member $member | |
| 196 | + * @return boolean | |
| 195 | 197 | */ | 
| 196 | 198 | public function canEdit($member = null) | 
| 197 | 199 |      { | 
| @@ -207,7 +209,7 @@ discard block | ||
| 207 | 209 | /** | 
| 208 | 210 | * @param null|int|Member $member | 
| 209 | 211 | * | 
| 210 | - * @return null|Member | |
| 212 | + * @return DataObject|null | |
| 211 | 213 | */ | 
| 212 | 214 | protected function getMember($member = null) | 
| 213 | 215 |      { | 
| @@ -326,6 +328,8 @@ discard block | ||
| 326 | 328 | |
| 327 | 329 | /** | 
| 328 | 330 |       * {@inheritdoc} | 
| 331 | + * @param Member $member | |
| 332 | + * @return boolean | |
| 329 | 333 | */ | 
| 330 | 334 | public function canAddChildren($member = null) | 
| 331 | 335 |      { | 
| @@ -417,7 +421,7 @@ discard block | ||
| 417 | 421 | /** | 
| 418 | 422 | * Gets the list of user candidates to be assigned to assist with this blog. | 
| 419 | 423 | * | 
| 420 | - * @return SS_List | |
| 424 | + * @return \SilverStripe\ORM\SS_List | |
| 421 | 425 | */ | 
| 422 | 426 | protected function getCandidateUsers() | 
| 423 | 427 |      { | 
| @@ -3,21 +3,16 @@ | ||
| 3 | 3 | namespace SilverStripe\Blog\Model; | 
| 4 | 4 | |
| 5 | 5 | use Page; | 
| 6 | -use PageController; | |
| 7 | 6 | use SilverStripe\Blog\Admin\GridFieldCategorisationConfig; | 
| 8 | 7 | use SilverStripe\Blog\Forms\GridField\GridFieldConfig_BlogPost; | 
| 9 | 8 | use SilverStripe\CMS\Controllers\RootURLController; | 
| 10 | 9 | use SilverStripe\Control\Controller; | 
| 11 | -use SilverStripe\Control\RSS\RSSFeed; | |
| 12 | 10 | use SilverStripe\Core\Convert; | 
| 13 | 11 | use SilverStripe\Forms\GridField\GridField; | 
| 14 | 12 | use SilverStripe\Forms\ListboxField; | 
| 15 | 13 | use SilverStripe\Forms\NumericField; | 
| 16 | -use SilverStripe\ORM\ArrayList; | |
| 17 | 14 | use SilverStripe\ORM\DataObject; | 
| 18 | 15 | use SilverStripe\ORM\DB; | 
| 19 | -use SilverStripe\ORM\FieldType\DBDatetime; | |
| 20 | -use SilverStripe\ORM\PaginatedList; | |
| 21 | 16 | use SilverStripe\ORM\UnsavedRelationList; | 
| 22 | 17 | use SilverStripe\Security\Group; | 
| 23 | 18 | use SilverStripe\Security\Member; | 
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | /** | 
| 88 | 88 | * Get the Member associated with the current URL segment. | 
| 89 | 89 | * | 
| 90 | - * @return null|Member | |
| 90 | + * @return \SilverStripe\ORM\DataObject|null | |
| 91 | 91 | */ | 
| 92 | 92 | public function getCurrentProfile() | 
| 93 | 93 |      { | 
| @@ -432,7 +432,7 @@ discard block | ||
| 432 | 432 | /** | 
| 433 | 433 | * Displays an RSS feed of blog posts. | 
| 434 | 434 | * | 
| 435 | - * @return string | |
| 435 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText | |
| 436 | 436 | */ | 
| 437 | 437 | public function rss() | 
| 438 | 438 |      { | 
| @@ -449,7 +449,7 @@ discard block | ||
| 449 | 449 | /** | 
| 450 | 450 | * Returns the current archive date. | 
| 451 | 451 | * | 
| 452 | - * @return null|Date | |
| 452 | + * @return BlogController|null | |
| 453 | 453 | */ | 
| 454 | 454 | public function getArchiveDate() | 
| 455 | 455 |      { | 
| @@ -492,7 +492,7 @@ discard block | ||
| 492 | 492 | * @param DataList $blogPosts | 
| 493 | 493 | * @param string $link | 
| 494 | 494 | * | 
| 495 | - * @return string | |
| 495 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText | |
| 496 | 496 | */ | 
| 497 | 497 | protected function rssFeed($blogPosts, $link) | 
| 498 | 498 |      { | 
| @@ -6,8 +6,6 @@ | ||
| 6 | 6 | use SilverStripe\Blog\Forms\BlogAdminSidebar; | 
| 7 | 7 | use SilverStripe\Control\Controller; | 
| 8 | 8 | use SilverStripe\Forms\DatetimeField; | 
| 9 | -use SilverStripe\Forms\HiddenField; | |
| 10 | -use SilverStripe\Forms\HTMLEditor\HTMLEditorField; | |
| 11 | 9 | use SilverStripe\Forms\ListboxField; | 
| 12 | 10 | use SilverStripe\Forms\TextField; | 
| 13 | 11 | use SilverStripe\Forms\ToggleCompositeField; | 
| @@ -375,7 +375,7 @@ discard block | ||
| 375 | 375 | /** | 
| 376 | 376 | * @param null|int|Member $member | 
| 377 | 377 | * | 
| 378 | - * @return null|Member | |
| 378 | + * @return \SilverStripe\ORM\DataObject|null | |
| 379 | 379 | */ | 
| 380 | 380 | protected function getMember($member = null) | 
| 381 | 381 |      { | 
| @@ -395,7 +395,7 @@ discard block | ||
| 395 | 395 | * | 
| 396 | 396 | * @param null|int|Member $member | 
| 397 | 397 | * | 
| 398 | - * @return bool | |
| 398 | + * @return boolean|string | |
| 399 | 399 | */ | 
| 400 | 400 | public function canCreateCategories($member = null) | 
| 401 | 401 |      { | 
| @@ -419,7 +419,7 @@ discard block | ||
| 419 | 419 | * | 
| 420 | 420 | * @param null|int|Member $member | 
| 421 | 421 | * | 
| 422 | - * @return bool | |
| 422 | + * @return boolean|string | |
| 423 | 423 | */ | 
| 424 | 424 | public function canCreateTags($member = null) | 
| 425 | 425 |      { | 
| @@ -514,6 +514,8 @@ discard block | ||
| 514 | 514 | |
| 515 | 515 | /** | 
| 516 | 516 |       * {@inheritdoc} | 
| 517 | + * @param Member $member | |
| 518 | + * @return boolean | |
| 517 | 519 | */ | 
| 518 | 520 | public function canPublish($member = null) | 
| 519 | 521 |      { | 
| @@ -550,6 +552,7 @@ discard block | ||
| 550 | 552 | |
| 551 | 553 | /** | 
| 552 | 554 |       * {@inheritdoc} | 
| 555 | + * @param \SilverStripe\ORM\DataObject $member | |
| 553 | 556 | */ | 
| 554 | 557 | public function canEdit($member = null) | 
| 555 | 558 |      { | 
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | /** | 
| 26 | 26 | * Augment queries so that we don't fetch unpublished articles. | 
| 27 | 27 | * | 
| 28 | - * @param SQLQuery $query | |
| 28 | + * @param SQLSelect $query | |
| 29 | 29 | */ | 
| 30 | 30 | public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null) | 
| 31 | 31 |      { | 
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | use SilverStripe\Blog\Model\Blog; | 
| 10 | 10 | use SilverStripe\Core\Convert; | 
| 11 | 11 | use SilverStripe\Forms\DropdownField; | 
| 12 | -use SilverStripe\Forms\FieldList; | |
| 13 | 12 | use SilverStripe\Forms\NumericField; | 
| 14 | 13 | use SilverStripe\Widgets\Model\Widget; | 
| 15 | 14 | |