Completed
Pull Request — master (#5229)
by Matt
11:45
created
filesystem/ImageManipulation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -509,7 +509,7 @@
 block discarded – undo
509 509
 	/**
510 510
 	 * Get HTML for img containing the icon for this file
511 511
 	 *
512
-	 * @return type
512
+	 * @return DBField
513 513
 	 */
514 514
 	public function IconTag() {
515 515
 		return DBField::create_field(
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/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/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/FormField.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -532,6 +532,7 @@  discard block
 block discarded – undo
532 532
 	 *
533 533
 	 * Caution: this doesn't work on all fields, see {@link setAttribute()}.
534 534
 	 *
535
+	 * @param string $name
535 536
 	 * @return null|string
536 537
 	 */
537 538
 	public function getAttribute($name) {
@@ -643,7 +644,6 @@  discard block
 block discarded – undo
643 644
 	 * Set the field value.
644 645
 	 *
645 646
 	 * @param mixed $value
646
-	 * @param null|array|DataObject $data {@see Form::loadDataFrom}
647 647
 	 *
648 648
 	 * @return $this
649 649
 	 */
@@ -1116,6 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 	 * @todo Make this abstract.
1117 1117
 	 *
1118 1118
 	 * @param Validator
1119
+	 * @param RequiredFields $validator
1119 1120
 	 *
1120 1121
 	 * @return bool
1121 1122
 	 */
@@ -1185,7 +1186,7 @@  discard block
 block discarded – undo
1185 1186
 	 *
1186 1187
 	 * @param FieldList $containerFieldList
1187 1188
 	 *
1188
-	 * @return FieldList
1189
+	 * @return FormField
1189 1190
 	 */
1190 1191
 	public function setContainerFieldList($containerFieldList) {
1191 1192
 		$this->containerFieldList = $containerFieldList;
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.