Completed
Push — master ( 009246...e56e4c )
by Hamish
11s
created
code/controllers/AssetAdmin.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -538,6 +538,10 @@
 block discarded – undo
538 538
 		return new Folder();
539 539
 	}
540 540
 
541
+	/**
542
+	 * @param string $childrenMethod
543
+	 * @param string $numChildrenMethod
544
+	 */
541 545
 	public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
542 546
 		if (!$childrenMethod) $childrenMethod = 'ChildFolders';
543 547
 		if (!$numChildrenMethod) $numChildrenMethod = 'numChildFolders';
Please login to merge, or discard this patch.
code/model/ErrorPage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -252,7 +252,7 @@
 block discarded – undo
252 252
 	/**
253 253
 	 * Write out the published version of the page to the filesystem
254 254
 	 *
255
-	 * @return true if the page write was successful
255
+	 * @return boolean if the page write was successful
256 256
 	 */
257 257
 	public function writeStaticPage() {
258 258
 		if(!self::config()->enable_static_file) {
Please login to merge, or discard this patch.
code/controllers/ContentController.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -222,6 +222,7 @@
 block discarded – undo
222 222
 
223 223
 	/**
224 224
 	 * Returns the associated database record
225
+	 * @return SiteTree
225 226
 	 */
226 227
 	public function data() {
227 228
 		return $this->dataRecord;
Please login to merge, or discard this patch.
code/model/VirtualPage.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -341,6 +341,9 @@
 block discarded – undo
341 341
 		}
342 342
 	}
343 343
 
344
+	/**
345
+	 * @param string $field
346
+	 */
344 347
 	public function getField($field) {
345 348
 		if($this->isFieldVirtualised($field)) {
346 349
 			return $this->CopyContentFrom()->getField($field);
Please login to merge, or discard this patch.
code/controllers/SilverStripeNavigator.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	protected $record;
21 21
 
22 22
 	/**
23
-	 * @param DataObject|CMSPreviewable $record
23
+	 * @param CMSPreviewable $record
24 24
 	 */
25 25
 	public function __construct(CMSPreviewable $record) {
26 26
 		parent::__construct();
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	protected $record;
107 107
 
108 108
 	/**
109
-	 * @param DataObject|CMSPreviewable $record
109
+	 * @param CMSPreviewable $record
110 110
 	 */
111 111
 	public function __construct(CMSPreviewable $record) {
112 112
 		parent::__construct();
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	public function getMessage() {}
150 150
 
151 151
 	/**
152
-	 * @return DataObject
152
+	 * @return CMSPreviewable
153 153
 	 */
154 154
 	public function getRecord() {
155 155
 		return $this->record;
Please login to merge, or discard this patch.
code/controllers/CMSMain.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
 
691 691
 	/**
692 692
 	 * @param SS_HTTPRequest $request
693
-	 * @return string HTML
693
+	 * @return DBHTMLText HTML
694 694
 	 */
695 695
 	public function treeview($request) {
696 696
 		return $this->renderWith($this->getTemplatesWithSuffix('_TreeView'));
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
 
699 699
 	/**
700 700
 	 * @param SS_HTTPRequest $request
701
-	 * @return string HTML
701
+	 * @return DBHTMLText HTML
702 702
 	 */
703 703
 	public function listview($request) {
704 704
 		return $this->renderWith($this->getTemplatesWithSuffix('_ListView'));
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 	 * Actually perform the publication step
1012 1012
 	 *
1013 1013
 	 * @param Versioned|DataObject $record
1014
-	 * @return mixed
1014
+	 * @return SS_HTTPResponse|null
1015 1015
 	 */
1016 1016
 	public function performPublish($record) {
1017 1017
 		if($record && !$record->canPublish()) {
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 	}
1166 1166
 
1167 1167
 	/**
1168
-	 * @return array
1168
+	 * @return SS_HTTPResponse|null
1169 1169
 	 */
1170 1170
 	public function rollback() {
1171 1171
 		return $this->doRollback(array(
Please login to merge, or discard this patch.
code/controllers/CMSPageHistoryController.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	/**
46 46
 	 * @param SS_HTTPRequest $request
47
-	 * @return array
47
+	 * @return SS_HTTPResponse
48 48
 	 */
49 49
 	public function show($request) {
50 50
 		$form = $this->ShowVersionForm($request->param('VersionID'));
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 	/**
65 65
 	 * @param SS_HTTPRequest $request
66
-	 * @return array
66
+	 * @return SS_HTTPResponse
67 67
 	 */
68 68
 	public function compare($request) {
69 69
 		$form = $this->CompareVersionsForm(
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	 * @param array
283 283
 	 * @param Form
284 284
 	 *
285
-	 * @return html
285
+	 * @return null|DBHTMLText
286 286
 	 */
287 287
 	public function doCompare($data, $form) {
288 288
 		$versions = $data['Versions'];
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @param array
320 320
 	 * @param Form
321 321
 	 *
322
-	 * @return html
322
+	 * @return null|DBHTMLText
323 323
 	 */
324 324
 	public function doShowVersion($data, $form) {
325 325
 		$versionID = null;
Please login to merge, or discard this patch.
code/controllers/CMSSiteTreeFilter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -215,7 +215,7 @@
 block discarded – undo
215 215
 	/**
216 216
 	 * Maps a list of pages to an array of associative arrays with ID and ParentID keys
217 217
 	 *
218
-	 * @param DataList $pages
218
+	 * @param SS_List $pages
219 219
 	 * @return array
220 220
 	 */
221 221
 	protected function mapIDs($pages) {
Please login to merge, or discard this patch.
code/forms/SiteTreeURLSegmentField.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -118,6 +118,9 @@
 block discarded – undo
118 118
 		return $this->defaultUrl;
119 119
 	}
120 120
 
121
+	/**
122
+	 * @param string $url
123
+	 */
121 124
 	public function setDefaultURL($url) {
122 125
 		$this->defaultUrl = $url;
123 126
 		return $this;
Please login to merge, or discard this patch.