Completed
Pull Request — master (#172)
by Helpful
02:15
created
code/controllers/ForumMemberProfile.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -556,7 +556,7 @@
 block discarded – undo
556 556
 	/**
557 557
 	 * Return the with the passed ID (via URL parameters) or the current user
558 558
 	 *
559
-	 * @return null|Member Returns the member object or NULL if the member
559
+	 * @return DataObject|null Returns the member object or NULL if the member
560 560
 	 *                     was not found
561 561
 	 */
562 562
  	function Member() {
Please login to merge, or discard this patch.
code/formfields/CheckableOption.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -3,6 +3,9 @@
 block discarded – undo
3 3
 class CheckableOption extends CompositeField {
4 4
 	protected $childField, $checkbox;
5 5
 		
6
+	/**
7
+	 * @param string $checkName
8
+	 */
6 9
 	function __construct($checkName, $childField, $value = "", $readonly = false) {
7 10
 		$this->name = $checkName;
8 11
 		$this->checkbox = new CheckboxField($checkName, "", $value);
Please login to merge, or discard this patch.
code/formfields/ForumCountryDropdownField.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -28,6 +28,10 @@
 block discarded – undo
28 28
 		return i18n::get_locale();
29 29
 	}
30 30
 
31
+	/**
32
+	 * @param string $name
33
+	 * @param string $title
34
+	 */
31 35
 	function __construct($name, $title = null, $source = null, $value = "", $form=null) {
32 36
 		if(!is_array($source)) {
33 37
 			// Get a list of countries from Zend
Please login to merge, or discard this patch.
code/model/ForumThread.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 	 * Check if they have visited this thread before. If they haven't increment 
144 144
 	 * the NumViews value by 1 and set visited to true.
145 145
 	 *
146
-	 * @return void
146
+	 * @return false|null
147 147
 	 */
148 148
 	public function incNumViews() {
149 149
 		if(Session::get('ForumViewed-' . $this->ID)) return false;
Please login to merge, or discard this patch.
code/pagetypes/Forum.php 1 patch
Doc Comments   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 
384 384
 	/**
385 385
 	 * Returns the Topics (the first Post of each Thread) for this Forum
386
-	 * @return DataList
386
+	 * @return PaginatedList
387 387
 	 */
388 388
 	public function getTopics() {
389 389
 		// Get a list of Posts
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 	 *
585 585
 	 * Designed to be called via AJAX so return true / false
586 586
 	 *
587
-	 * @return bool
587
+	 * @return null|false
588 588
 	 */
589 589
 	public function unsubscribe(SS_HTTPRequest $request) {
590 590
 		$member = Member::currentUser();
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 	/**
709 709
 	 * Get posts to display. This method assumes an URL parameter "ID" which contains the thread ID.
710 710
 	 * @param string sortDirection The sort order direction, either ASC for ascending (default) or DESC for descending
711
-	 * @return DataObjectSet Posts
711
+	 * @return PaginatedList Posts
712 712
 	 */
713 713
 	function Posts($sortDirection = "ASC") {
714 714
 		$numPerPage = Forum::$posts_per_page;
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 	/**
738 738
 	 * Get the usable BB codes
739 739
 	 *
740
-	 * @return DataObjectSet Returns the usable BB codes
740
+	 * @return ArrayList Returns the usable BB codes
741 741
 	 * @see BBCodeParser::usable_tags()
742 742
 	 */
743 743
 	function BBTags() {
@@ -1018,6 +1018,8 @@  discard block
 block discarded – undo
1018 1018
 
1019 1019
 	/**
1020 1020
 	 * Send email to moderators notifying them the thread has been created or post added/edited.
1021
+	 * @param DataObject $post
1022
+	 * @param DataObject $thread
1021 1023
 	 */
1022 1024
 	function notifyModerators($post, $thread, $starting_thread = false) {
1023 1025
 		$moderators = $this->Moderators();
@@ -1340,6 +1342,10 @@  discard block
 block discarded – undo
1340 1342
  * TODO: Remove once API in core
1341 1343
  */
1342 1344
 class Forum_DataQuery extends DataQuery {
1345
+
1346
+	/**
1347
+	 * @param string $dataClass
1348
+	 */
1343 1349
 	function __construct($dataClass, $query) {
1344 1350
 		parent::__construct($dataClass);
1345 1351
 		$this->query = $query;
Please login to merge, or discard this patch.
code/pagetypes/ForumHolder.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 	/**
339 339
 	 * Get a list of Forum Categories
340
-	 * @return DataList
340
+	 * @return boolean
341 341
 	 */
342 342
 	function getShowInCategories() {
343 343
 	 	$forumCategories = ForumCategory::get()->filter('ForumHolderID', $this->ID);
@@ -484,8 +484,9 @@  discard block
 block discarded – undo
484 484
 	 *                    it (keys: 'last_id', 'last_created')
485 485
 	 * @param int $lastVisit Unix timestamp of the last visit (GMT)
486 486
 	 * @param int $lastPostID ID of the last read post
487
-	 * @param int $thread ID of the relevant topic (set to NULL for all
487
+	 * @param integer $threadID ID of the relevant topic (set to NULL for all
488 488
 	 *                     topics)
489
+	 * @param integer $forumID
489 490
 	 * @return bool Returns TRUE if there are new posts available, otherwise
490 491
 	 *              FALSE.
491 492
 	 */
@@ -857,7 +858,7 @@  discard block
 block discarded – undo
857 858
 	/**
858 859
 	 * Return the GlobalAnnouncements from the individual forums
859 860
 	 *
860
-	 * @return DataObjectSet
861
+	 * @return ArrayList
861 862
 	 */
862 863
 	function GlobalAnnouncements() {
863 864
 		//dump(ForumHolder::baseForumTable());
Please login to merge, or discard this patch.