Completed
Pull Request — 3.2 (#5154)
by Jono
10:39
created
filesystem/FileNameFilter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
 	protected $transliterator;
100 100
 
101 101
 	/**
102
-	 * @return SS_Transliterator|NULL
102
+	 * @return SS_Transliterator
103 103
 	 */
104 104
 	public function getTransliterator() {
105 105
 		if($this->transliterator === null && $this->config()->default_use_transliterator) {
Please login to merge, or discard this patch.
filesystem/Folder.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 * Find the given folder or create it as a database record
46 46
 	 *
47 47
 	 * @param string $folderPath Directory path relative to assets root
48
-	 * @return Folder|null
48
+	 * @return null|DataObject
49 49
 	 */
50 50
 	public static function find_or_make($folderPath) {
51 51
 		// replace leading and trailing slashes
Please login to merge, or discard this patch.
forms/CheckboxSetField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@
 block discarded – undo
169 169
 	 * Note: Items marked as disabled through {@link setDisabledItems()} can still be
170 170
 	 * selected by default through this method.
171 171
 	 *
172
-	 * @param Array $items Collection of array keys, as defined in the $source array
172
+	 * @param integer[] $items Collection of array keys, as defined in the $source array
173 173
 	 */
174 174
 	public function setDefaultItems($items) {
175 175
 		$this->defaultItems = $items;
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/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/FormAction.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
 	/**
78 78
 	 * @param array $properties
79
-	 * @return HTMLText
79
+	 * @return string
80 80
 	 */
81 81
 	public function Field($properties = array()) {
82 82
 		$properties = array_merge(
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 	/**
95 95
 	 * @param array $properties
96
-	 * @return HTMLText
96
+	 * @return string
97 97
 	 */
98 98
 	public function FieldHolder($properties = array()) {
99 99
 		return $this->Field($properties);
@@ -157,6 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * Enable or disable the rendering of this action as a <button />
158 158
 	 *
159 159
 	 * @param boolean
160
+	 * @param boolean $bool
160 161
 	 * @return $this
161 162
 	 */
162 163
 	public function setUseButtonTag($bool) {
Please login to merge, or discard this patch.
forms/FormScaffolder.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,6 @@
 block discarded – undo
49 49
 
50 50
 	/**
51 51
 	 * @param DataObject $obj
52
-	 * @param array $params
53 52
 	 */
54 53
 	public function __construct($obj) {
55 54
 		$this->obj = $obj;
Please login to merge, or discard this patch.
forms/gridfield/GridField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 	 *
198 198
 	 * @todo refactor this into GridFieldComponent
199 199
 	 *
200
-	 * @param mixed $value
200
+	 * @param string $value
201 201
 	 * @param string|array $castingDefinition
202 202
 	 *
203 203
 	 * @return mixed
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 	 * @param int $index
570 570
 	 * @param DataObject $record
571 571
 	 *
572
-	 * @return array
572
+	 * @return string[]
573 573
 	 */
574 574
 	protected function newRowClasses($total, $index, $record) {
575 575
 		$classes = array('ss-gridfield-item');
Please login to merge, or discard this patch.