Merge pull request #2531 from ajshort/pull-5

Correct some incorrect PHPDoc definitions.
This commit is contained in:
Ingo Schommer 2013-10-13 01:36:16 -07:00
commit 1bcd4c9a6a
2 changed files with 6 additions and 5 deletions

View File

@ -139,10 +139,11 @@ class FormField extends RequestHandler {
} }
/** /**
* Create a new field. * Creates a new field.
* @param name The internal field name, passed to forms. *
* @param title The field label. * @param string $name The internal field name, passed to forms.
* @param value The value of the field. * @param string $title The human-readable field label.
* @param mixed $value The value of the field.
*/ */
public function __construct($name, $title = null, $value = null) { public function __construct($name, $title = null, $value = null) {
$this->name = $name; $this->name = $name;

View File

@ -2781,7 +2781,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @param string|array $limit A limit expression to be inserted into the LIMIT clause. * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
* @param string $containerClass The container class to return the results in. * @param string $containerClass The container class to return the results in.
* *
* @return mixed The objects matching the filter, in the class specified by $containerClass * @return DataList
*/ */
public static function get($callerClass = null, $filter = "", $sort = "", $join = "", $limit = null, public static function get($callerClass = null, $filter = "", $sort = "", $join = "", $limit = null,
$containerClass = 'DataList') { $containerClass = 'DataList') {