silverstripe / silverstripe-framework

model/FieldType/DBField.php

Doc Comments +4 added lines, -3 removed lines

@@ -251,7 +251,7 @@ 
 	/**
 	 * Get the table this field belongs to, if assigned
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getTable() {
 		return $this->tableName;
@@ -316,6 +316,7 @@ 
 
 	/**
 	 * Saves this field to the given data object.
+	 * @param \DataObject $dataObject
 	 */
 	public function saveInto($dataObject) {
 		$fieldName = $this->name;
@@ -333,7 +334,7 @@ 
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}
 	 *
 	 * @param string $title Optional. Localized title of the generated instance
-	 * @return FormField
+	 * @return TextField
 	 */
 	public function scaffoldFormField($title = null) {
 		$field = new TextField($this->name, $title);
@@ -348,7 +349,7 @@ 
 	 * Used by {@link SearchContext}, {@link ModelAdmin}, {@link DataObject::scaffoldFormFields()}.
 	 *
 	 * @param string $title Optional. Localized title of the generated instance
-	 * @return FormField
+	 * @return TextField
 	 */
 	public function scaffoldSearchField($title = null) {
 		return $this->scaffoldFormField($title);

view/ViewableData.php

Doc Comments +3 added lines, -4 removed lines

@@ -144,7 +144,7 @@ 
 	/**
 	 * Get the current failover object if set
 	 *
-	 * @return ViewableData|null
+	 * @return ViewableData
 	 */
 	public function getFailover() {
 		return $this->failover;
@@ -247,7 +247,7 @@ 
 	 *  - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)")
 	 *
 	 * @param string $field
-	 * @return array
+	 * @return string
 	 */
 	public function castingHelperPair($field) {
 		Deprecation::notice('2.5', 'use castingHelper() instead');
@@ -339,7 +339,7 @@ 
 	 *
 	 * @param string|array|SSViewer $template the template to render into
 	 * @param array $customFields fields to customise() the object with before rendering
-	 * @return HTMLText
+	 * @return DBField
 	 */
 	public function renderWith($template, $customFields = null) {
 		if(!is_object($template)) {
@@ -516,7 +516,6 @@ 
 	/**
 	 * Get an array of XML-escaped values by field name
 	 *
-	 * @param array $elements an array of field names
 	 * @return array
 	 */
 	public function getXMLValues($fields) {