Completed
Pull Request — master (#5001)
by Damian
12:24
created
core/Injectable.php 1 patch
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -23,8 +23,6 @@  discard block
 block discarded – undo
23 23
 	 *    $list = DataList::create('SiteTree');
24 24
 	 *	  $list = SiteTree::get();
25 25
 	 *
26
-	 * @param string $class the class name
27
-	 * @param mixed $arguments,... arguments to pass to the constructor
28 26
 	 * @return static
29 27
 	 */
30 28
 	public static function create() {
@@ -47,7 +45,6 @@  discard block
 block discarded – undo
47 45
 	 * way to access instance methods which don't rely on instance
48 46
 	 * data (e.g. the custom SilverStripe static handling).
49 47
 	 *
50
-	 * @param string $className Optional classname (if called on Object directly)
51 48
 	 * @return static The singleton instance
52 49
 	 */
53 50
 	public static function singleton() {
Please login to merge, or discard this patch.
core/Extensible.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -387,7 +387,7 @@
 block discarded – undo
387 387
 	 * The extension methods are defined during {@link __construct()} in {@link defineMethods()}.
388 388
 	 *
389 389
 	 * @param string $method the name of the method to call on each extension
390
-	 * @param mixed $a1,... up to 7 arguments to be passed to the method
390
+	 * @param \Controller $a4
391 391
 	 * @return array
392 392
 	 */
393 393
 	public function extend($method, &$a1=null, &$a2=null, &$a3=null, &$a4=null, &$a5=null, &$a6=null, &$a7=null) {
Please login to merge, or discard this patch.
filesystem/Upload.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * Set a different instance than {@link Upload_Validator}
115 115
 	 * for this upload session.
116 116
 	 *
117
-	 * @param object $validator
117
+	 * @param Upload_Validator $validator
118 118
 	 */
119 119
 	public function setValidator($validator) {
120 120
 		$this->validator = $validator;
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 	/**
364 364
 	 * Determines wether previous operations caused an error.
365 365
 	 *
366
-	 * @return boolean
366
+	 * @return integer
367 367
 	 */
368 368
 	public function isError() {
369 369
 		return (count($this->errors));
Please login to merge, or discard this patch.
forms/FieldList.php 1 patch
Doc Comments   +10 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,6 +118,7 @@  discard block
 block discarded – undo
118 118
 	 *                        or TabSet.Tab.Subtab.
119 119
 	 * This function will create any missing tabs.
120 120
 	 * @param array $fields An array of {@link FormField} objects.
121
+	 * @param string $insertBefore
121 122
 	 */
122 123
 	public function addFieldsToTab($tabName, $fields, $insertBefore = null) {
123 124
 		$this->flushFieldsCache();
@@ -157,7 +158,7 @@  discard block
 block discarded – undo
157 158
 	 * Removes a number of fields from a Tab/TabSet within this FieldList.
158 159
 	 *
159 160
 	 * @param string $tabName The name of the Tab or TabSet field
160
-	 * @param array $fields A list of fields, e.g. array('Name', 'Email')
161
+	 * @param string[] $fields A list of fields, e.g. array('Name', 'Email')
161 162
 	 */
162 163
 	public function removeFieldsFromTab($tabName, $fields) {
163 164
 		$this->flushFieldsCache();
@@ -440,6 +441,7 @@  discard block
 block discarded – undo
440 441
 
441 442
 	/**
442 443
 	 * Handler method called before the FieldList is going to be manipulated.
444
+	 * @param FormField $item
443 445
 	 */
444 446
 	protected function onBeforeInsert($item) {
445 447
 		$this->flushFieldsCache();
@@ -512,6 +514,7 @@  discard block
 block discarded – undo
512 514
 	 * Transform this FieldList with a given tranform method,
513 515
 	 * e.g. $this->transform(new ReadonlyTransformation())
514 516
 	 *
517
+	 * @param ReadonlyTransformation $trans
515 518
 	 * @return FieldList
516 519
 	 */
517 520
 	public function transform($trans) {
@@ -531,6 +534,9 @@  discard block
 block discarded – undo
531 534
 		else return $this;
532 535
 	}
533 536
 
537
+	/**
538
+	 * @param CompositeField $field
539
+	 */
534 540
 	public function setContainerField($field) {
535 541
 		$this->containerField = $field;
536 542
 		return $this;
@@ -549,6 +555,7 @@  discard block
 block discarded – undo
549 555
 	 * Transform the named field into a readonly feld.
550 556
 	 *
551 557
 	 * @param string|FormField
558
+	 * @param string $field
552 559
 	 */
553 560
 	public function makeFieldReadonly($field) {
554 561
 		$fieldName = ($field instanceof FormField) ? $field->getName() : $field;
@@ -598,6 +605,7 @@  discard block
 block discarded – undo
598 605
 	 * the children collection. Doesn't work recursively.
599 606
 	 *
600 607
 	 * @param string|FormField
608
+	 * @param string $field
601 609
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
602 610
 	 *             be found.
603 611
 	 */
@@ -645,7 +653,7 @@  discard block
 block discarded – undo
645 653
 	 * Support function for backwards compatibility purposes.
646 654
 	 * Caution: Volatile API, might be removed in 3.1 or later.
647 655
 	 *
648
-	 * @param  String $tabname Path to a tab, e.g. "Root.Content.Main"
656
+	 * @param  string $name Path to a tab, e.g. "Root.Content.Main"
649 657
 	 * @return String Rewritten path, based on {@link tabPathRewrites}
650 658
 	 */
651 659
 	protected function rewriteTabPath($name) {
Please login to merge, or discard this patch.
forms/gridfield/GridFieldDetailForm.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -185,6 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
 	/**
187 187
 	 * @param String
188
+	 * @param string $class
188 189
 	 */
189 190
 	public function setItemRequestClass($class) {
190 191
 		$this->itemRequestClass = $class;
@@ -292,6 +293,9 @@  discard block
 block discarded – undo
292 293
 		parent::__construct();
293 294
 	}
294 295
 
296
+	/**
297
+	 * @param string $action
298
+	 */
295 299
 	public function Link($action = null) {
296 300
 		return Controller::join_links($this->gridField->Link('item'),
297 301
 			$this->record->ID ? $this->record->ID : 'new', $action);
@@ -320,6 +324,9 @@  discard block
 block discarded – undo
320 324
 		}
321 325
 	}
322 326
 
327
+	/**
328
+	 * @param SS_HTTPRequest $request
329
+	 */
323 330
 	public function edit($request) {
324 331
 		$controller = $this->getToplevelController();
325 332
 		$form = $this->ItemEditForm($this->gridField, $request);
@@ -515,6 +522,9 @@  discard block
 block discarded – undo
515 522
 		return $c;
516 523
 	}
517 524
 
525
+	/**
526
+	 * @return string
527
+	 */
518 528
 	protected function getBackLink(){
519 529
 		// TODO Coupling with CMS
520 530
 		$backlink = '';
@@ -616,6 +626,9 @@  discard block
 block discarded – undo
616 626
 		}
617 627
 	}
618 628
 
629
+	/**
630
+	 * @param integer $errorCode
631
+	 */
619 632
 	public function httpError($errorCode, $errorMessage = null) {
620 633
 		$controller = $this->getToplevelController();
621 634
 		return $controller->httpError($errorCode, $errorMessage);
Please login to merge, or discard this patch.
model/versioning/Versioned.php 1 patch
Doc Comments   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 	 * If extended, ensure that both canDelete and canUnpublish are extended also
819 819
 	 *
820 820
 	 * @param Member $member
821
-	 * @return bool
821
+	 * @return null|boolean
822 822
 	 */
823 823
 	public function canArchive($member = null) {
824 824
 		// Skip if invoked by extendedCan()
@@ -857,7 +857,7 @@  discard block
 block discarded – undo
857 857
 	 * Extend permissions to include additional security for objects that are not published to live.
858 858
 	 *
859 859
 	 * @param Member $member
860
-	 * @return bool|null
860
+	 * @return false|null
861 861
 	 */
862 862
 	public function canView($member = null) {
863 863
 		// Invoke default version-gnostic canView
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 	 *
932 932
 	 * @param string $stage
933 933
 	 * @param Member $member
934
-	 * @return bool
934
+	 * @return boolean|string
935 935
 	 */
936 936
 	public function canViewStage($stage = 'Live', $member = null) {
937 937
 		$oldMode = Versioned::get_reading_mode();
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
996 996
 	/**
997 997
 	 * Get the latest published DataObject.
998 998
 	 *
999
-	 * @return DataObject
999
+	 * @return string
1000 1000
 	 */
1001 1001
 	public function latestPublished() {
1002 1002
 		// Get the root data object class - this will have the version field
@@ -1265,6 +1265,7 @@  discard block
 block discarded – undo
1265 1265
 	/**
1266 1266
 	 * Return the base table - the class that directly extends DataObject.
1267 1267
 	 *
1268
+	 * @param string $stage
1268 1269
 	 * @return string
1269 1270
 	 */
1270 1271
 	public function baseTable($stage = null) {
@@ -1431,7 +1432,6 @@  discard block
 block discarded – undo
1431 1432
 	 * @param string $stage The name of the stage.
1432 1433
 	 * @param string $filter A filter to be inserted into the WHERE clause.
1433 1434
 	 * @param boolean $cache Use caching.
1434
-	 * @param string $orderby A sort expression to be inserted into the ORDER BY clause.
1435 1435
 	 *
1436 1436
 	 * @return DataObject
1437 1437
 	 */
@@ -1594,6 +1594,8 @@  discard block
 block discarded – undo
1594 1594
 	/**
1595 1595
 	 * Return the latest version of the given page.
1596 1596
 	 *
1597
+	 * @param string $class
1598
+	 * @param integer $id
1597 1599
 	 * @return DataObject
1598 1600
 	 */
1599 1601
 	public static function get_latest_version($class, $id) {
Please login to merge, or discard this patch.