Completed
Pull Request — 2.0 (#435)
by Fred
02:50
created
code/formfields/FieldEditor.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	/**
22 22
 	 * @param array $properties
23 23
 	 *
24
-	 * @return HTML
24
+	 * @return HTMLText
25 25
 	 */
26 26
 	public function FieldHolder($properties = array()) {
27 27
 		$add = Controller::join_links($this->Link('addfield'));
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	/**
86 86
 	 * Return the fields.
87 87
 	 * 
88
-	 * @return RelationList
88
+	 * @return HasManyList|null
89 89
 	 */
90 90
 	public function Fields() {
91 91
 		if($this->form && $this->form->getRecord() && $this->name) {
Please login to merge, or discard this patch.
code/formfields/UserFormsGridFieldExportButton.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
      *
18 18
      * @param GridField $gridField
19 19
      *
20
-     * @return array
20
+     * @return string
21 21
      */
22 22
     public function generateExportFileData($gridField)
23 23
     {
Please login to merge, or discard this patch.
code/model/formfields/EditableFormField.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	/**
64 64
 	 * Template to render the form field into
65 65
 	 *
66
-	 * @return String
66
+	 * @return HTMLText
67 67
 	 */
68 68
 	public function EditSegment() {
69 69
 		return $this->renderWith('EditableFormField');
@@ -177,6 +177,8 @@  discard block
 block discarded – undo
177 177
 	 *
178 178
 	 * @param String key 
179 179
 	 * @param String value
180
+	 * @param string $key
181
+	 * @param string $value
180 182
 	 */
181 183
 	public function setSetting($key, $value) {
182 184
 		$settings = $this->getSettings();
@@ -203,6 +205,7 @@  discard block
 block discarded – undo
203 205
 	 * not exist
204 206
 	 *
205 207
 	 * @param String Value to use as key
208
+	 * @param string $setting
206 209
 	 * @return String
207 210
 	 */
208 211
 	public function getSetting($setting) {
@@ -256,7 +259,7 @@  discard block
 block discarded – undo
256 259
 	/**
257 260
 	 * Return the custom validation fields for the field
258 261
 	 * 
259
-	 * @return DataObjectSet
262
+	 * @return ArrayList
260 263
 	 */
261 264
 	public function CustomRules() {
262 265
 		$output = new ArrayList();
@@ -328,6 +331,7 @@  discard block
 block discarded – undo
328 331
 	 * Generate a name for the Setting field
329 332
 	 *
330 333
 	 * @param String name of the setting
334
+	 * @param string $field
331 335
 	 * @return String
332 336
 	 */
333 337
 	public function getSettingName($field) {
Please login to merge, or discard this patch.
code/model/UserDefinedForm.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
 	 * as it escapes our values with "" which appears to break the validate plugin
857 857
 	 *
858 858
 	 * @param Array array to convert
859
-	 * @return JSON
859
+	 * @return string
860 860
 	 */
861 861
 	public function array2json($array) {
862 862
 		foreach($array as $key => $value) {
@@ -1275,6 +1275,9 @@  discard block
 block discarded – undo
1275 1275
 
1276 1276
 	protected $data;
1277 1277
 
1278
+	/**
1279
+	 * @param ArrayList $submittedFields
1280
+	 */
1278 1281
 	public function __construct($submittedFields = null) {
1279 1282
 		parent::__construct($submittedFields = null);
1280 1283
 	}
Please login to merge, or discard this patch.