Completed
Push — master ( ba98f7...d2485a )
by Hamish
02:40
created
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/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/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|SilverStripe\Model\FieldType\DBField
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|SilverStripe\Model\FieldType\DBField
319 319
 	 */
320 320
 	public function doShowVersion($data, $form) {
321 321
 		$versionID = null;
Please login to merge, or discard this patch.
code/controllers/ModelAsController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 	/**
44 44
 	 * @uses ModelAsController::getNestedController()
45 45
 	 * @param SS_HTTPRequest $request
46
-	 * @param DataModel $model
46
+	 * @param null|DataModel $model
47 47
 	 * @return SS_HTTPResponse
48 48
 	 */
49 49
 	public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
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/AssetAdmin.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -48,6 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
 	/**
50 50
 	 * Return fake-ID "root" if no ID is found (needed to upload files into the root-folder)
51
+	 * @return string
51 52
 	 */
52 53
 	public function currentPageID() {
53 54
 		if(is_numeric($this->getRequest()->requestVar('ID')))	{
@@ -562,6 +563,10 @@  discard block
 block discarded – undo
562 563
 		return new Folder();
563 564
 	}
564 565
 
566
+	/**
567
+	 * @param string $childrenMethod
568
+	 * @param string $numChildrenMethod
569
+	 */
565 570
 	public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
566 571
 		if (!$childrenMethod) $childrenMethod = 'ChildFolders';
567 572
 		if (!$numChildrenMethod) $numChildrenMethod = 'numChildFolders';
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
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
 	 * Gets the list of filtered pages
114 114
 	 *
115 115
 	 * @see {@link SiteTree::getStatusFlags()}
116
-	 * @return SS_List
116
+	 * @return DataList
117 117
 	 */
118 118
 	abstract public function getFilteredPages();
119 119
 
Please login to merge, or discard this patch.