Completed
Push — master ( 849cd8...301702 )
by Hamish
18s
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/forms/SiteTreeURLSegmentField.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,6 +89,7 @@  discard block
 block discarded – undo
89 89
 	
90 90
 	/**
91 91
 	 * @param the url that prefixes the page url segment field
92
+	 * @param string $url
92 93
 	 */
93 94
 	public function setURLPrefix($url){
94 95
 		$this->urlPrefix = $url;
@@ -96,7 +97,7 @@  discard block
 block discarded – undo
96 97
 	}
97 98
 	
98 99
 	/**
99
-	 * @return the url prefixes the page url segment field to show in template
100
+	 * @return string url prefixes the page url segment field to show in template
100 101
 	 */
101 102
 	public function getURLPrefix(){
102 103
 		return $this->urlPrefix;
@@ -107,7 +108,7 @@  discard block
 block discarded – undo
107 108
 	}
108 109
 
109 110
 	/**
110
-	 * @return Indicator for UI to respond to changes accurately,
111
+	 * @return string for UI to respond to changes accurately,
111 112
 	 * and auto-update the field value if changes to the default occur.
112 113
 	 * Does not set the field default value.
113 114
 	 */
@@ -115,6 +116,9 @@  discard block
 block discarded – undo
115 116
 		return $this->defaultUrl;
116 117
 	}
117 118
 	
119
+	/**
120
+	 * @param string $url
121
+	 */
118 122
 	public function setDefaultURL($url) {
119 123
 		$this->defaultUrl = $url;
120 124
 		return $this;
Please login to merge, or discard this patch.
tasks/UpgradeSiteTreePermissionSchemaTask.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@
 block discarded – undo
19 19
 		See http://open.silverstripe.com/ticket/2847
20 20
 	";
21 21
 	
22
+	/**
23
+	 * @param SS_HTTPRequest $request
24
+	 */
22 25
 	public function run($request) {
23 26
 		// transfer values for changed column name
24 27
 		foreach(array('SiteTree','SiteTree_Live','SiteTree_versions') as $table) {
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/SiteTree.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1278,7 +1278,7 @@  discard block
 block discarded – undo
1278 1278
 	/**
1279 1279
 	 * Get the 'can edit' information for a number of SiteTree pages.
1280 1280
 	 *
1281
-	 * @param array $ids       An array of IDs of the SiteTree pages to look up
1281
+	 * @param integer[] $ids       An array of IDs of the SiteTree pages to look up
1282 1282
 	 * @param int   $memberID  ID of member
1283 1283
 	 * @param bool  $useCached Return values from the permission cache if they exist
1284 1284
 	 * @return array
@@ -1351,7 +1351,7 @@  discard block
 block discarded – undo
1351 1351
 	 *
1352 1352
 	 * @param string $condition The PHP condition to be evaluated. The page will be called $item
1353 1353
 	 * @param array  $collator  An array, passed by reference, to collect all of the matching descendants.
1354
-	 * @return bool
1354
+	 * @return boolean|null
1355 1355
 	 */
1356 1356
 	public function collateDescendants($condition, &$collator) {
1357 1357
 		if($children = $this->Children()) {
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
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	
41 41
 	/**
42 42
 	 * @param SS_HTTPRequest $request
43
-	 * @return array
43
+	 * @return SS_HTTPResponse
44 44
 	 */
45 45
 	public function show($request) {
46 46
 		$form = $this->ShowVersionForm($request->param('VersionID'));
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	
60 60
 	/**
61 61
 	 * @param SS_HTTPRequest $request
62
-	 * @return array
62
+	 * @return SS_HTTPResponse
63 63
 	 */
64 64
 	public function compare($request) {
65 65
 		$form = $this->CompareVersionsForm(
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 * @param array
279 279
 	 * @param Form
280 280
 	 *
281
-	 * @return html
281
+	 * @return null|HTMLText
282 282
 	 */
283 283
 	public function doCompare($data, $form) {
284 284
 		$versions = $data['Versions'];
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 	 * @param array
316 316
 	 * @param Form
317 317
 	 *
318
-	 * @return html
318
+	 * @return null|HTMLText
319 319
 	 */	
320 320
 	public function doShowVersion($data, $form) {
321 321
 		$versionID = null;
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/CMSMain.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 
660 660
 	/**
661 661
 	 * @param SS_HTTPRequest $request
662
-	 * @return string HTML
662
+	 * @return HTMLText HTML
663 663
 	 */
664 664
 	public function treeview($request) {
665 665
 		return $this->renderWith($this->getTemplatesWithSuffix('_TreeView'));
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
 
668 668
 	/**
669 669
 	 * @param SS_HTTPRequest $request
670
-	 * @return string HTML
670
+	 * @return HTMLText HTML
671 671
 	 */
672 672
 	public function listview($request) {
673 673
 		return $this->renderWith($this->getTemplatesWithSuffix('_ListView'));
@@ -989,7 +989,7 @@  discard block
 block discarded – undo
989 989
 	 * Actually perform the publication step
990 990
 	 *
991 991
 	 * @param Versioned|DataObject $record
992
-	 * @return mixed
992
+	 * @return SS_HTTPResponse|null
993 993
 	 */
994 994
 	public function performPublish($record) {
995 995
 		if($record && !$record->canPublish()) {
@@ -1175,7 +1175,7 @@  discard block
 block discarded – undo
1175 1175
 	}
1176 1176
 
1177 1177
 	/**
1178
-	 * @return array
1178
+	 * @return SS_HTTPResponse|null
1179 1179
 	 */
1180 1180
 	public function rollback() {
1181 1181
 		return $this->doRollback(array(
Please login to merge, or discard this patch.