Completed
Push — master ( af5a53...6e68f3 )
by Sam
10:43
created
forms/FormAction.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 	/**
95 95
 	 * @param array $properties
96
-	 * @return string
96
+	 * @return DBHTMLText
97 97
 	 */
98 98
 	public function Field($properties = array()) {
99 99
 		$properties = array_merge(
@@ -158,6 +158,7 @@  discard block
 block discarded – undo
158 158
 	 * Enable or disable the rendering of this action as a <button />
159 159
 	 *
160 160
 	 * @param boolean
161
+	 * @param boolean $bool
161 162
 	 * @return $this
162 163
 	 */
163 164
 	public function setUseButtonTag($bool) {
Please login to merge, or discard this patch.
forms/FormField.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -647,6 +647,7 @@  discard block
 block discarded – undo
647 647
 	 *
648 648
 	 * Caution: this doesn't work on all fields, see {@link setAttribute()}.
649 649
 	 *
650
+	 * @param string $name
650 651
 	 * @return null|string
651 652
 	 */
652 653
 	public function getAttribute($name) {
@@ -758,7 +759,6 @@  discard block
 block discarded – undo
758 759
 	 * Set the field value.
759 760
 	 *
760 761
 	 * @param mixed $value
761
-	 * @param null|array|DataObject $data {@see Form::loadDataFrom}
762 762
 	 *
763 763
 	 * @return $this
764 764
 	 */
@@ -1239,6 +1239,7 @@  discard block
 block discarded – undo
1239 1239
 	 * @todo Make this abstract.
1240 1240
 	 *
1241 1241
 	 * @param Validator
1242
+	 * @param RequiredFields $validator
1242 1243
 	 *
1243 1244
 	 * @return bool
1244 1245
 	 */
@@ -1286,7 +1287,7 @@  discard block
 block discarded – undo
1286 1287
 	 * This function is used by the template processor. If you refer to a field as a $ variable, it
1287 1288
 	 * will return the $Field value.
1288 1289
 	 *
1289
-	 * @return string
1290
+	 * @return DBHTMLText
1290 1291
 	 */
1291 1292
 	public function forTemplate() {
1292 1293
 		return $this->Field();
@@ -1308,7 +1309,7 @@  discard block
 block discarded – undo
1308 1309
 	 *
1309 1310
 	 * @param FieldList $containerFieldList
1310 1311
 	 *
1311
-	 * @return FieldList
1312
+	 * @return FormField
1312 1313
 	 */
1313 1314
 	public function setContainerFieldList($containerFieldList) {
1314 1315
 		$this->containerFieldList = $containerFieldList;
@@ -1471,7 +1472,7 @@  discard block
 block discarded – undo
1471 1472
 	 * Any passed keys that are not defined in {@link getSchemaDataDefaults()} are ignored.
1472 1473
 	 * If you want to pass around ad hoc data use the `data` array e.g. pass `['data' => ['myCustomKey' => 'yolo']]`.
1473 1474
 	 *
1474
-	 * @param array $schemaData - The data to be merged with $this->schemaData.
1475
+	 * @param array $schemaState - The data to be merged with $this->schemaData.
1475 1476
 	 * @return FormField
1476 1477
 	 *
1477 1478
 	 * @todo Add deep merging of arrays like `data` and `attributes`.
Please login to merge, or discard this patch.
forms/HiddenField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 	/**
14 14
 	 * @param array $properties
15
-	 * @return string
15
+	 * @return DBHTMLText
16 16
 	 */
17 17
 	public function FieldHolder($properties = array()) {
18 18
 		return $this->Field($properties);
Please login to merge, or discard this patch.
forms/LookupField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 *
25 25
 	 * @param array $properties
26 26
 	 *
27
-	 * @return string
27
+	 * @return SilverStripe\ORM\FieldType\DBHTMLText
28 28
 	 */
29 29
 	public function Field($properties = array()) {
30 30
 		$source = ArrayLib::flatten($this->getSource());
Please login to merge, or discard this patch.
forms/NullableField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * Set the label used for the Is Null checkbox.
86 86
 	 *
87
-	 * @param $isNulLabel string
87
+	 * @param string $isNulLabel string
88 88
 	 *
89 89
 	 * @return $this
90 90
 	 */
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	/**
129 129
 	 * Value is sometimes an array, and sometimes a single value, so we need to handle both cases
130 130
 	 *
131
-	 * @param mixed $value
131
+	 * @param string|null $value
132 132
 	 * @param null|array $data
133 133
 	 *
134 134
 	 * @return $this
Please login to merge, or discard this patch.
forms/TextField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	}
48 48
 
49 49
 	/**
50
-	 * @return null|int
50
+	 * @return integer
51 51
 	 */
52 52
 	public function getMaxLength() {
53 53
 		return $this->maxLength;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	}
74 74
 
75 75
 	/**
76
-	 * @return string
76
+	 * @return SilverStripe\ORM\FieldType\DBHTMLText
77 77
 	 */
78 78
 	public function InternallyLabelledField() {
79 79
 		Deprecation::notice('4.0', 'Please use ->setValue() instead');
Please login to merge, or discard this patch.
forms/TreeDropdownField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	 *
81 81
 	 * @param string $name the field name
82 82
 	 * @param string $title the field label
83
-	 * @param string|array $sourceObject The object-type to list in the tree. This could
83
+	 * @param string $sourceObject The object-type to list in the tree. This could
84 84
 	 * be one of the following:
85 85
 	 * - A DataObject class name with the {@link Hierarchy} extension.
86 86
 	 * - An array of key/value pairs, like a {@link DropdownField} source. In
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
 	/**
218 218
 	 * @param array $properties
219
-	 * @return string
219
+	 * @return DBHTMLText
220 220
 	 */
221 221
 	public function Field($properties = array()) {
222 222
 		Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang');
Please login to merge, or discard this patch.
forms/UploadField.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 	/**
286 286
 	 * Determine if the target folder for new uploads in is visible the field UI.
287 287
 	 *
288
-	 * @return boolean
288
+	 * @return boolean|string
289 289
 	 */
290 290
 	public function canPreviewFolder() {
291 291
 		if(!$this->isActive()) return false;
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 	/**
639 639
 	 * Determine if the user has permission to upload.
640 640
 	 *
641
-	 * @return boolean
641
+	 * @return boolean|string
642 642
 	 */
643 643
 	public function canUpload() {
644 644
 		if(!$this->isActive()) return false;
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 	 * Determine if the user has permission to attach existing files
663 663
 	 * By default returns true if the user has the CMS_ACCESS_AssetAdmin permission
664 664
 	 *
665
-	 * @return boolean
665
+	 * @return boolean|string
666 666
 	 */
667 667
 	public function canAttachExisting() {
668 668
 		if(!$this->isActive()) return false;
@@ -1094,7 +1094,7 @@  discard block
 block discarded – undo
1094 1094
 
1095 1095
 	/**
1096 1096
 	 * @param SS_HTTPRequest $request
1097
-	 * @return UploadField_ItemHandler
1097
+	 * @return UploadField_SelectHandler
1098 1098
 	 */
1099 1099
 	public function handleSelect(SS_HTTPRequest $request) {
1100 1100
 		if(!$this->canAttachExisting()) return $this->httpError(403);
@@ -1457,7 +1457,7 @@  discard block
 block discarded – undo
1457 1457
 	 * Action to handle editing of a single file
1458 1458
 	 *
1459 1459
 	 * @param SS_HTTPRequest $request
1460
-	 * @return ViewableData_Customised
1460
+	 * @return DBHTMLText
1461 1461
 	 */
1462 1462
 	public function edit(SS_HTTPRequest $request) {
1463 1463
 		// Check form field state
Please login to merge, or discard this patch.
ORM/Connect/DBSchemaManager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -475,7 +475,7 @@
 block discarded – undo
475 475
 	/**
476 476
 	 * Given an index spec determines the index type
477 477
 	 *
478
-	 * @param array|string $spec
478
+	 * @param string $spec
479 479
 	 * @return string
480 480
 	 */
481 481
 	protected function determineIndexType($spec) {
Please login to merge, or discard this patch.