Completed
Pull Request — master (#5942)
by Ingo
13:34
created
tests/forms/RequirementsTest.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -118,6 +118,11 @@  discard block
 block discarded – undo
118 118
 		);
119 119
 	}
120 120
 	
121
+	/**
122
+	 * @param Requirements_Backend $backend
123
+	 * @param boolean $async
124
+	 * @param boolean $defer
125
+	 */
121 126
 	protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) {
122 127
         $basePath = $this->getCurrentRelativePath();
123 128
         $this->setupRequirements($backend);
@@ -805,6 +810,10 @@  discard block
 block discarded – undo
805 810
 		}
806 811
 	}
807 812
 
813
+	/**
814
+	 * @param Requirements_Backend $backend
815
+	 * @param string $type
816
+	 */
808 817
 	public function assertFileNotIncluded($backend, $type, $files) {
809 818
 		$includedFiles = $this->getBackendFiles($backend, $type);
810 819
 		if(is_array($files)) {
Please login to merge, or discard this patch.
forms/SelectionGroup.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -152,6 +152,9 @@  discard block
 block discarded – undo
152 152
 		return $this->title;
153 153
 	}
154 154
 
155
+	/**
156
+	 * @param string $title
157
+	 */
155 158
 	function setTitle($title) {
156 159
 		$this->title = $title;
157 160
 		return $this;
@@ -161,6 +164,9 @@  discard block
 block discarded – undo
161 164
 		return $this->value;
162 165
 	}
163 166
 
167
+	/**
168
+	 * @param string $Value
169
+	 */
164 170
 	function setValue($Value) {
165 171
 		$this->value = $Value;
166 172
 		return $this;
Please login to merge, or discard this patch.
forms/FileField.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
 	/**
89 89
 	 * @param array $properties
90
-	 * @return string
90
+	 * @return DBHTMLText
91 91
 	 */
92 92
 	public function Field($properties = array()) {
93 93
 		$properties = array_merge($properties, array(
@@ -251,7 +251,6 @@  discard block
 block discarded – undo
251 251
 	 * for each of these categories
252 252
 	 *
253 253
 	 * @param string $category Category name
254
-	 * @param string,... $categories Additional category names
255 254
 	 * @return $this
256 255
 	 */
257 256
 	public function setAllowedFileCategories($category) {
Please login to merge, or discard this patch.
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/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/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.