Completed
Pull Request — master (#3924)
by Daniel
11:48
created
model/FieldType/DBField.php 1 patch
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	/**
252 252
 	 * Get the table this field belongs to, if assigned
253 253
 	 *
254
-	 * @return string|null
254
+	 * @return string
255 255
 	 */
256 256
 	public function getTable() {
257 257
 		return $this->tableName;
@@ -316,6 +316,7 @@  discard block
 block discarded – undo
316 316
 
317 317
 	/**
318 318
 	 * Saves this field to the given data object.
319
+	 * @param \DataObject $dataObject
319 320
 	 */
320 321
 	public function saveInto($dataObject) {
321 322
 		$fieldName = $this->name;
@@ -333,7 +334,7 @@  discard block
 block discarded – undo
333 334
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}
334 335
 	 *
335 336
 	 * @param string $title Optional. Localized title of the generated instance
336
-	 * @return FormField
337
+	 * @return TextField
337 338
 	 */
338 339
 	public function scaffoldFormField($title = null) {
339 340
 		$field = new TextField($this->name, $title);
@@ -348,7 +349,7 @@  discard block
 block discarded – undo
348 349
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}.
349 350
 	 *
350 351
 	 * @param string $title Optional. Localized title of the generated instance
351
-	 * @return FormField
352
+	 * @return TextField
352 353
 	 */
353 354
 	public function scaffoldSearchField($title = null) {
354 355
 		return $this->scaffoldFormField($title);
Please login to merge, or discard this patch.
view/ViewableData.php 1 patch
Doc Comments   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	/**
145 145
 	 * Get the current failover object if set
146 146
 	 *
147
-	 * @return ViewableData|null
147
+	 * @return ViewableData
148 148
 	 */
149 149
 	public function getFailover() {
150 150
 		return $this->failover;
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	 *  - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)")
248 248
 	 *
249 249
 	 * @param string $field
250
-	 * @return array
250
+	 * @return string
251 251
 	 */
252 252
 	public function castingHelperPair($field) {
253 253
 		Deprecation::notice('2.5', 'use castingHelper() instead');
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 *
340 340
 	 * @param string|array|SSViewer $template the template to render into
341 341
 	 * @param array $customFields fields to customise() the object with before rendering
342
-	 * @return HTMLText
342
+	 * @return DBField
343 343
 	 */
344 344
 	public function renderWith($template, $customFields = null) {
345 345
 		if(!is_object($template)) {
@@ -516,7 +516,6 @@  discard block
 block discarded – undo
516 516
 	/**
517 517
 	 * Get an array of XML-escaped values by field name
518 518
 	 *
519
-	 * @param array $elements an array of field names
520 519
 	 * @return array
521 520
 	 */
522 521
 	public function getXMLValues($fields) {
Please login to merge, or discard this patch.