Completed
Pull Request — master (#6394)
by Ed
10:36
created
src/Forms/FormField.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -807,7 +807,6 @@  discard block
 block discarded – undo
807 807
      * Set the field value.
808 808
      *
809 809
      * @param mixed $value
810
-     * @param null|array|DataObject $data {@see Form::loadDataFrom}
811 810
      * @return $this
812 811
      */
813 812
     public function setValue($value)
@@ -1251,7 +1250,7 @@  discard block
 block discarded – undo
1251 1250
     /**
1252 1251
      * @param FormTransformation $transformation
1253 1252
      *
1254
-     * @return mixed
1253
+     * @return FormField
1255 1254
      */
1256 1255
     public function transform(FormTransformation $transformation)
1257 1256
     {
@@ -1362,7 +1361,7 @@  discard block
 block discarded – undo
1362 1361
      * This function is used by the template processor. If you refer to a field as a $ variable, it
1363 1362
      * will return the $Field value.
1364 1363
      *
1365
-     * @return string
1364
+     * @return DBHTMLText
1366 1365
      */
1367 1366
     public function forTemplate()
1368 1367
     {
Please login to merge, or discard this patch.
src/Forms/GridField/GridField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -228,7 +228,7 @@
 block discarded – undo
228 228
      *
229 229
      * @todo refactor this into GridFieldComponent
230 230
      *
231
-     * @param mixed $value
231
+     * @param string $value
232 232
      * @param string|array $castingDefinition
233 233
      *
234 234
      * @return mixed
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldAddExistingAutocompleter.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
     /**
155 155
      *
156 156
      * @param GridField $gridField
157
-     * @return array
157
+     * @return string[]
158 158
      */
159 159
     public function getActions($gridField)
160 160
     {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
     }
297 297
 
298 298
     /**
299
-     * @param array $fields
299
+     * @param string[] $fields
300 300
      * @return $this
301 301
      */
302 302
     public function setSearchFields($fields)
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -92,6 +92,9 @@  discard block
 block discarded – undo
92 92
         parent::__construct();
93 93
     }
94 94
 
95
+    /**
96
+     * @param string $action
97
+     */
95 98
     public function Link($action = null)
96 99
     {
97 100
         return Controller::join_links(
@@ -341,6 +344,9 @@  discard block
 block discarded – undo
341 344
         return $c;
342 345
     }
343 346
 
347
+    /**
348
+     * @return string
349
+     */
344 350
     protected function getBackLink()
345 351
     {
346 352
         // TODO Coupling with CMS
@@ -448,6 +454,9 @@  discard block
 block discarded – undo
448 454
         }
449 455
     }
450 456
 
457
+    /**
458
+     * @param integer $errorCode
459
+     */
451 460
     public function httpError($errorCode, $errorMessage = null)
452 461
     {
453 462
         $controller = $this->getToplevelController();
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldEditButton.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      * Which columns are handled by this component
66 66
      *
67 67
      * @param GridField $gridField
68
-     * @return array
68
+     * @return string[]
69 69
      */
70 70
     public function getColumnsHandled($gridField)
71 71
     {
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param GridField $gridField
88 88
      * @param DataObject $record
89 89
      * @param string $columnName
90
-     * @return string The HTML for the column
90
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText The HTML for the column
91 91
      */
92 92
     public function getColumnContent($gridField, $record, $columnName)
93 93
     {
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldExportButton.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * export is an action button
76 76
      *
77 77
      * @param GridField $gridField
78
-     * @return array
78
+     * @return string[]
79 79
      */
80 80
     public function getActions($gridField)
81 81
     {
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
      * Generate export fields for CSV.
150 150
      *
151 151
      * @param GridField $gridField
152
-     * @return array
152
+     * @return string
153 153
      */
154 154
     public function generateExportFileData($gridField)
155 155
     {
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldPrintButton.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -392,7 +392,7 @@
 block discarded – undo
392 392
     /**
393 393
      * Get location of all editor.css files
394 394
      *
395
-     * @return array
395
+     * @return string[]
396 396
      */
397 397
     protected function getEditorCSS() {
398 398
         $editor = array();
Please login to merge, or discard this patch.
src/Forms/HTMLEditor/EmbedShortcodeProvider.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
      * Gets the list of shortcodes provided by this handler
19 19
      *
20
-     * @return mixed
20
+     * @return string[]
21 21
      */
22 22
     public static function get_shortcodes()
23 23
     {
Please login to merge, or discard this patch.
src/Forms/HTMLEditor/HTMLEditorConfig.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -148,14 +148,14 @@
 block discarded – undo
148 148
      * Get the current value of an option
149 149
      *
150 150
      * @param string $key The key of the option to get
151
-     * @return mixed The value of the specified option
151
+     * @return string The value of the specified option
152 152
      */
153 153
     abstract public function getOption($key);
154 154
 
155 155
     /**
156 156
      * Set the value of one option
157 157
      * @param string $key The key of the option to set
158
-     * @param mixed $value The value of the option to set
158
+     * @param string $value The value of the option to set
159 159
      * @return $this
160 160
      */
161 161
     abstract public function setOption($key, $value);
Please login to merge, or discard this patch.