silverstripe / silverstripe-cms

code/controllers/ModelAsController.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	/**
 	 * @uses ModelAsController::getNestedController()
 	 * @param SS_HTTPRequest $request
-	 * @param DataModel $model
+	 * @param null|DataModel $model
 	 * @return SS_HTTPResponse
 	 */
 	public function handleRequest(SS_HTTPRequest $request, DataModel $model) {

code/controllers/AssetAdmin.php

Doc Comments +5 added lines

@@ -48,6 +48,7 @@ 
 
 	/**
 	 * Return fake-ID "root" if no ID is found (needed to upload files into the root-folder)
+	 * @return string
 	 */
 	public function currentPageID() {
 		if(is_numeric($this->getRequest()->requestVar('ID')))	{
@@ -562,6 +563,10 @@ 
 		return new Folder();
 	}
 
+	/**
+	 * @param string $childrenMethod
+	 * @param string $numChildrenMethod
+	 */
 	public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
 		if (!$childrenMethod) $childrenMethod = 'ChildFolders';
 		if (!$numChildrenMethod) $numChildrenMethod = 'numChildFolders';

code/controllers/CMSSiteTreeFilter.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	 * Gets the list of filtered pages
 	 *
 	 * @see {@link SiteTree::getStatusFlags()}
-	 * @return SS_List
+	 * @return DataList
 	 */
 	abstract public function getFilteredPages();
 

code/model/SiteTree.php

Doc Comments +2 added lines, -2 removed lines

@@ -680,7 +680,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);
@@ -1313,7 +1313,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()) {