tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 21:29:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4839 from Ocramius/patch-1

Browse Source 
Dead code removal (constructor type-hints are sufficient)
This commit is contained in:
Damian Mooyman 2015-12-11 13:46:44 +13:00
commit 79b86c304e
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
forms/Form.php
View File

@ -229,21 +229,11 @@ class Form extends RequestHandler {
* @param FieldList $fields All of the fields in the form - a {@link FieldList} of {@link FormField} objects. * @param FieldList $fields All of the fields in the form - a {@link FieldList} of {@link FormField} objects.
* @param FieldList $actions All of the action buttons in the form - a {@link FieldLis} of * @param FieldList $actions All of the action buttons in the form - a {@link FieldLis} of
* {@link FormAction} objects * {@link FormAction} objects
* @param Validator $validator Override the default validator instance (Default: {@link RequiredFields}) * @param Validator|null $validator Override the default validator instance (Default: {@link RequiredFields})
*/ */
public function __construct($controller, $name, FieldList $fields, FieldList $actions, $validator = null) { public function __construct($controller, $name, FieldList $fields, FieldList $actions, Validator $validator = null) {
parent::__construct(); parent::__construct();
if(!$fields instanceof FieldList) {
throw new InvalidArgumentException('$fields must be a valid FieldList instance');
}
if(!$actions instanceof FieldList) {
throw new InvalidArgumentException('$actions must be a valid FieldList instance');
}
if($validator && !$validator instanceof Validator) {
throw new InvalidArgumentException('$validator must be a Validator instance');
}
$fields->setForm($this); $fields->setForm($this);
$actions->setForm($this); $actions->setForm($this);