silverstripe / silverstripe-cms

code/controllers/CMSMain.php

Doc Comments +4 added lines, -4 removed lines

@@ -661,7 +661,7 @@ 
 
 	/**
 	 * @param SS_HTTPRequest $request
-	 * @return string HTML
+	 * @return SilverStripe\Model\FieldType\DBField HTML
 	 */
 	public function treeview($request) {
 		return $this->renderWith($this->getTemplatesWithSuffix('_TreeView'));
@@ -669,7 +669,7 @@ 
 
 	/**
 	 * @param SS_HTTPRequest $request
-	 * @return string HTML
+	 * @return SilverStripe\Model\FieldType\DBField HTML
 	 */
 	public function listview($request) {
 		return $this->renderWith($this->getTemplatesWithSuffix('_ListView'));
@@ -982,7 +982,7 @@ 
 	 * Actually perform the publication step
 	 *
 	 * @param Versioned|DataObject $record
-	 * @return mixed
+	 * @return SS_HTTPResponse|null
 	 */
 	public function performPublish($record) {
 		if($record && !$record->canPublish()) {
@@ -1136,7 +1136,7 @@ 
 	}
 
 	/**
-	 * @return array
+	 * @return SS_HTTPResponse|null
 	 */
 	public function rollback() {
 		return $this->doRollback(array(

code/model/SiteTree.php

Doc Comments +3 added lines, -3 removed lines

@@ -661,7 +661,7 @@ 
 	 * @param boolean $unlinked Whether to link page titles.
 	 * @param boolean|string $stopAtPageType ClassName of a page to stop the upwards traversal.
 	 * @param boolean $showHidden Include pages marked with the attribute ShowInMenus = 0
-	 * @return HTMLText The breadcrumb trail.
+	 * @return SilverStripe\Model\FieldType\DBField The breadcrumb trail.
 	 */
 	public function Breadcrumbs($maxDepth = 20, $unlinked = false, $stopAtPageType = false, $showHidden = false) {
 		$pages = $this->getBreadcrumbItems($maxDepth, $stopAtPageType, $showHidden);
@@ -1198,7 +1198,7 @@ 
 	/**
 	 * Get the 'can edit' information for a number of SiteTree pages.
 	 *
-	 * @param array $ids       An array of IDs of the SiteTree pages to look up
+	 * @param integer[] $ids       An array of IDs of the SiteTree pages to look up
 	 * @param int   $memberID  ID of member
 	 * @param bool  $useCached Return values from the permission cache if they exist
 	 * @return array
@@ -1271,7 +1271,7 @@ 
 	 *
 	 * @param string $condition The PHP condition to be evaluated. The page will be called $item
 	 * @param array  $collator  An array, passed by reference, to collect all of the matching descendants.
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function collateDescendants($condition, &$collator) {
 		if($children = $this->Children()) {