Completed
Pull Request — master (#5046)
by Scott
12:46
created
filesystem/Upload.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * Set a different instance than {@link Upload_Validator}
108 108
 	 * for this upload session.
109 109
 	 *
110
-	 * @param object $validator
110
+	 * @param Upload_Validator $validator
111 111
 	 */
112 112
 	public function setValidator($validator) {
113 113
 		$this->validator = $validator;
@@ -287,7 +287,8 @@  discard block
 block discarded – undo
287 287
 	}
288 288
 
289 289
 	/**
290
-	 * @return Boolean
290
+	 * @param boolean $bool
291
+	 * @return boolean|null
291 292
 	 */
292 293
 	public function setReplaceFile($bool) {
293 294
 		$this->replaceFile = $bool;
@@ -351,7 +352,7 @@  discard block
 block discarded – undo
351 352
 	/**
352 353
 	 * Determines wether previous operations caused an error.
353 354
 	 *
354
-	 * @return boolean
355
+	 * @return integer
355 356
 	 */
356 357
 	public function isError() {
357 358
 		return (count($this->errors));
Please login to merge, or discard this patch.
forms/AssetField.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,6 @@  discard block
 block discarded – undo
144 144
 	 *
145 145
 	 * @param string $name The internal field name, passed to forms.
146 146
 	 * @param string $title The field label.
147
-	 * @param Form $form Reference to the container form
148 147
 	 */
149 148
 	public function __construct($name, $title = null) {
150 149
 		$this->addExtraClass('ss-upload'); // class, used by js
@@ -256,6 +255,10 @@  discard block
 block discarded – undo
256 255
 		return $this->record;
257 256
 	}
258 257
 
258
+	/**
259
+	 * @param null|DataObject $value
260
+	 * @param DataObject $record
261
+	 */
259 262
 	public function setValue($value, $record = null) {
260 263
 		// Extract value from underlying record
261 264
 		if(empty($value) && $this->getName() && $record instanceof DataObject) {
Please login to merge, or discard this patch.
forms/CompositeField.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -94,6 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
 	/**
96 96
 	 * @param string
97
+	 * @param string $tag
97 98
 	 */
98 99
 	public function setTag($tag) {
99 100
 		$this->tag = $tag;
@@ -110,6 +111,7 @@  discard block
 block discarded – undo
110 111
 
111 112
 	/**
112 113
 	 * @param string
114
+	 * @param string $legend
113 115
 	 */
114 116
 	public function setLegend($legend) {
115 117
 		$this->legend = $legend;
@@ -200,6 +202,9 @@  discard block
 block discarded – undo
200 202
 		return false;
201 203
 	}
202 204
 
205
+	/**
206
+	 * @param string $name
207
+	 */
203 208
 	public function fieldByName($name) {
204 209
 		return $this->children->fieldByName($name);
205 210
 	}
@@ -224,6 +229,8 @@  discard block
 block discarded – undo
224 229
 
225 230
 	/**
226 231
 	 * @uses FieldList->insertAfter()
232
+	 * @param string $insertAfter
233
+	 * @param FormField $field
227 234
 	 */
228 235
 	public function insertAfter($insertAfter, $field) {
229 236
 		$ret = $this->children->insertAfter($insertAfter, $field);
@@ -309,6 +316,7 @@  discard block
 block discarded – undo
309 316
 	 * the children collection. Doesn't work recursively.
310 317
 	 *
311 318
 	 * @param string|FormField
319
+	 * @param string $field
312 320
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
313 321
 	 *             be found.
314 322
 	 */
Please login to merge, or discard this patch.
forms/ConfirmedPasswordField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	/**
121 121
 	 * @param array $properties
122 122
 	 *
123
-	 * @return HTMLText
123
+	 * @return string
124 124
 	 */
125 125
 	public function Field($properties = array()) {
126 126
 		Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 	 *
418 418
 	 * @param DataObjectInterface $record
419 419
 	 *
420
-	 * @return boolean
420
+	 * @return false|null
421 421
 	 */
422 422
 	public function saveInto(DataObjectInterface $record) {
423 423
 		if(!$this->isSaveable()) {
Please login to merge, or discard this patch.
forms/DateField.php 1 patch
Doc Comments   +9 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,6 +90,11 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	protected $valueObj = null;
92 92
 
93
+	/**
94
+	 * @param string $name
95
+	 * @param string $title
96
+	 * @param string $value
97
+	 */
93 98
 	public function __construct($name, $title = null, $value = null) {
94 99
 		if(!$this->locale) {
95 100
 			$this->locale = i18n::get_locale();
@@ -288,6 +293,9 @@  discard block
 block discarded – undo
288 293
 		return $field;
289 294
 	}
290 295
 
296
+	/**
297
+	 * @param string $class
298
+	 */
291 299
 	public function castedCopy($class) {
292 300
 		$copy = new $class($this->name);
293 301
 		if($copy->hasMethod('setConfig')) {
@@ -326,7 +334,7 @@  discard block
 block discarded – undo
326 334
 	 * @deprecated 4.0 Use the "DateField.default_config" config setting instead
327 335
 	 * @param String $k
328 336
 	 * @param mixed $v
329
-	 * @return boolean
337
+	 * @return boolean|null
330 338
 	 */
331 339
 	public static function set_default_config($k, $v) {
332 340
 		Deprecation::notice('4.0', 'Use the "DateField.default_config" config setting instead');
Please login to merge, or discard this patch.
forms/DatetimeField.php 1 patch
Doc Comments   +18 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,6 +56,10 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	protected $config;
58 58
 
59
+	/**
60
+	 * @param string $name
61
+	 * @param string $title
62
+	 */
59 63
 	public function __construct($name, $title = null, $value = ""){
60 64
 		$this->config = $this->config()->default_config;
61 65
 
@@ -68,6 +72,9 @@  discard block
 block discarded – undo
68 72
 		parent::__construct($name, $title, $value);
69 73
 	}
70 74
 
75
+	/**
76
+	 * @param Form $form
77
+	 */
71 78
 	public function setForm($form) {
72 79
 		parent::setForm($form);
73 80
 
@@ -78,6 +85,9 @@  discard block
 block discarded – undo
78 85
 		return $this;
79 86
 	}
80 87
 
88
+	/**
89
+	 * @param string $name
90
+	 */
81 91
 	public function setName($name) {
82 92
 		parent::setName($name);
83 93
 
@@ -90,7 +100,7 @@  discard block
 block discarded – undo
90 100
 
91 101
 	/**
92 102
 	 * @param array $properties
93
-	 * @return HTMLText
103
+	 * @return string
94 104
 	 */
95 105
 	public function FieldHolder($properties = array()) {
96 106
 		$config = array(
@@ -240,6 +250,7 @@  discard block
 block discarded – undo
240 250
 
241 251
 	/**
242 252
 	 * @param FormField
253
+	 * @param DateField $field
243 254
 	 */
244 255
 	public function setDateField($field) {
245 256
 		$expected = $this->getName() . '[date]';
@@ -265,6 +276,7 @@  discard block
 block discarded – undo
265 276
 
266 277
 	/**
267 278
 	 * @param FormField
279
+	 * @param TimeField $field
268 280
 	 */
269 281
 	public function setTimeField($field) {
270 282
 		$expected = $this->getName() . '[time]';
@@ -303,7 +315,7 @@  discard block
 block discarded – undo
303 315
 	 * to set field-specific config options.
304 316
 	 *
305 317
 	 * @param string $name
306
-	 * @param mixed $val
318
+	 * @param string $val
307 319
 	 */
308 320
 	public function setConfig($name, $val) {
309 321
 		$this->config[$name] = $val;
@@ -321,7 +333,7 @@  discard block
 block discarded – undo
321 333
 	 * to get field-specific config options.
322 334
 	 *
323 335
 	 * @param String $name Optional, returns the whole configuration array if empty
324
-	 * @return mixed
336
+	 * @return string|null
325 337
 	 */
326 338
 	public function getConfig($name = null) {
327 339
 		if($name) {
@@ -331,6 +343,9 @@  discard block
 block discarded – undo
331 343
 		}
332 344
 	}
333 345
 
346
+	/**
347
+	 * @param RequiredFields $validator
348
+	 */
334 349
 	public function validate($validator) {
335 350
 		$dateValid = $this->dateField->validate($validator);
336 351
 		$timeValid = $this->timeField->validate($validator);
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();
@@ -426,6 +427,7 @@  discard block
 block discarded – undo
426 427
 
427 428
 	/**
428 429
 	 * Handler method called before the FieldList is going to be manipulated.
430
+	 * @param FormField $item
429 431
 	 */
430 432
 	protected function onBeforeInsert($item) {
431 433
 		$this->flushFieldsCache();
@@ -498,6 +500,7 @@  discard block
 block discarded – undo
498 500
 	 * Transform this FieldList with a given tranform method,
499 501
 	 * e.g. $this->transform(new ReadonlyTransformation())
500 502
 	 *
503
+	 * @param ReadonlyTransformation $trans
501 504
 	 * @return FieldList
502 505
 	 */
503 506
 	public function transform($trans) {
@@ -517,6 +520,9 @@  discard block
 block discarded – undo
517 520
 		else return $this;
518 521
 	}
519 522
 
523
+	/**
524
+	 * @param CompositeField $field
525
+	 */
520 526
 	public function setContainerField($field) {
521 527
 		$this->containerField = $field;
522 528
 		return $this;
@@ -535,6 +541,7 @@  discard block
 block discarded – undo
535 541
 	 * Transform the named field into a readonly feld.
536 542
 	 *
537 543
 	 * @param string|FormField
544
+	 * @param string $field
538 545
 	 */
539 546
 	public function makeFieldReadonly($field) {
540 547
 		$fieldName = ($field instanceof FormField) ? $field->getName() : $field;
@@ -584,6 +591,7 @@  discard block
 block discarded – undo
584 591
 	 * the children collection. Doesn't work recursively.
585 592
 	 *
586 593
 	 * @param string|FormField
594
+	 * @param string $field
587 595
 	 * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't
588 596
 	 *             be found.
589 597
 	 */
@@ -631,7 +639,7 @@  discard block
 block discarded – undo
631 639
 	 * Support function for backwards compatibility purposes.
632 640
 	 * Caution: Volatile API, might be removed in 3.1 or later.
633 641
 	 *
634
-	 * @param  String $tabname Path to a tab, e.g. "Root.Content.Main"
642
+	 * @param  String $name Path to a tab, e.g. "Root.Content.Main"
635 643
 	 * @return String Rewritten path, based on {@link tabPathRewrites}
636 644
 	 */
637 645
 	protected function rewriteTabPath($name) {
Please login to merge, or discard this patch.
forms/FileField.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 	/**
87 87
 	 * @param array $properties
88
-	 * @return HTMLText
88
+	 * @return string
89 89
 	 */
90 90
 	public function Field($properties = array()) {
91 91
 		$properties = array_merge($properties, array(
@@ -249,7 +249,6 @@  discard block
 block discarded – undo
249 249
 	 * for each of these categories
250 250
 	 *
251 251
 	 * @param string $category Category name
252
-	 * @param string,... $categories Additional category names
253 252
 	 * @return $this
254 253
 	 */
255 254
 	public function setAllowedFileCategories($category) {
Please login to merge, or discard this patch.
forms/Form.php 1 patch
Doc Comments   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 	/**
535 535
 	 * Fields can have action to, let's check if anyone of the responds to $funcname them
536 536
 	 *
537
-	 * @param SS_List|array $fields
537
+	 * @param FieldList|null $fields
538 538
 	 * @param callable $funcName
539 539
 	 * @return FormField
540 540
 	 */
@@ -673,6 +673,7 @@  discard block
 block discarded – undo
673 673
 	 * Set actions that are exempt from validation
674 674
 	 * 
675 675
 	 * @param array
676
+	 * @param string[] $actions
676 677
 	 */
677 678
 	public function setValidationExemptActions($actions) {
678 679
 		$this->validationExemptActions = $actions;
@@ -812,6 +813,7 @@  discard block
 block discarded – undo
812 813
 	}
813 814
 
814 815
 	/**
816
+	 * @param string $name
815 817
 	 * @return string $name
816 818
 	 */
817 819
 	public function getAttribute($name) {
@@ -846,6 +848,7 @@  discard block
 block discarded – undo
846 848
 	 *
847 849
 	 * @param array Custom attributes to process. Falls back to {@link getAttributes()}.
848 850
 	 * If at least one argument is passed as a string, all arguments act as excludes by name.
851
+	 * @param string $attrs
849 852
 	 *
850 853
 	 * @return string HTML attributes, ready for insertion into an HTML tag
851 854
 	 */
@@ -1053,7 +1056,7 @@  discard block
 block discarded – undo
1053 1056
 	 * If set to false (the default), then the form method is only used to construct the default
1054 1057
 	 * form.
1055 1058
 	 *
1056
-	 * @param $bool boolean
1059
+	 * @param boolean $bool boolean
1057 1060
 	 * @return $this
1058 1061
 	 */
1059 1062
 	public function setStrictFormMethodCheck($bool) {
@@ -1556,7 +1559,7 @@  discard block
 block discarded – undo
1556 1559
 	 * This is returned when you access a form as $FormObject rather
1557 1560
 	 * than <% with FormObject %>
1558 1561
 	 *
1559
-	 * @return HTML
1562
+	 * @return HTMLText
1560 1563
 	 */
1561 1564
 	public function forTemplate() {
1562 1565
 		$return = $this->renderWith(array_merge(
@@ -1576,7 +1579,7 @@  discard block
 block discarded – undo
1576 1579
 	 * It triggers slightly different behaviour, such as disabling the rewriting
1577 1580
 	 * of # links.
1578 1581
 	 *
1579
-	 * @return HTML
1582
+	 * @return HTMLText
1580 1583
 	 */
1581 1584
 	public function forAjaxTemplate() {
1582 1585
 		$view = new SSViewer(array(
@@ -1599,7 +1602,7 @@  discard block
 block discarded – undo
1599 1602
 	 * and _form_enctype.  These are the attributes of the form.  These fields
1600 1603
 	 * can be used to send the form to Ajax.
1601 1604
 	 *
1602
-	 * @return HTML
1605
+	 * @return string
1603 1606
 	 */
1604 1607
 	public function formHtmlContent() {
1605 1608
 		$this->IncludeFormTag = false;
@@ -1860,6 +1863,9 @@  discard block
 block discarded – undo
1860 1863
 
1861 1864
 	protected $form;
1862 1865
 
1866
+	/**
1867
+	 * @param Form $form
1868
+	 */
1863 1869
 	public function __construct($form) {
1864 1870
 		$this->form = $form;
1865 1871
 		parent::__construct();
Please login to merge, or discard this patch.