merged branch samuelwilliams/formDoc (PR #5928)

fabpot · fabpot · commit f4c05e3fe8ef · 2012-11-12T10:51:00.000+01:00
This PR was squashed before being merged into the master branch (closes #5928). Commits ------- 6a033f3 setData method also accepts objects. Doc should reflect this. Discussion ---------- setData method also accepts objects. Doc should reflect this. Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: NA Todo: None License of the code: MIT Documentation PR: None
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -98,7 +98,7 @@ public function getErrors();
     /**
      * Updates the form with default data.
      *
-     * @param  array $modelData The data formatted as expected for the underlying object
+     * @param  mixed $modelData The data formatted as expected for the underlying object
      *
      * @return FormInterface The form instance
      *

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getErrors();`
`98`	`98`	`/**`
`99`	`99`	`* Updates the form with default data.`
`100`	`100`	`*`
`101`		`- * @param array $modelData The data formatted as expected for the underlying object`
	`101`	`+ * @param mixed $modelData The data formatted as expected for the underlying object`
`102`	`102`	`*`
`103`	`103`	`* @return FormInterface The form instance`
`104`	`104`	`*`