Completed
Pull Request — master (#5536)
by Simon
10:44
created
forms/htmleditor/HTMLEditorField.php 1 patch
Doc Comments   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	/**
61 61
 	 * Assign a new configuration instance or identifier
62 62
 	 *
63
-	 * @param string|HTMLEditorConfig $config
63
+	 * @param string $config
64 64
 	 * @return $this
65 65
 	 */
66 66
 	public function setEditorConfig($config) {
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 *
75 75
 	 * @param string $name The internal field name, passed to forms.
76 76
 	 * @param string $title The human-readable field label.
77
-	 * @param mixed $value The value of the field.
77
+	 * @param integer $value The value of the field.
78 78
 	 * @param string $config HTMLEditorConfig identifier to be used. Default to the active one.
79 79
 	 */
80 80
 	public function __construct($name, $title = null, $value = '', $config = null) {
@@ -115,6 +115,9 @@  discard block
 block discarded – undo
115 115
 		$record->{$this->name} = $htmlValue->getContent();
116 116
 	}
117 117
 
118
+	/**
119
+	 * @param string|null $value
120
+	 */
118 121
 	public function setValue($value) {
119 122
 		// Regenerate links prior to preview, so that the editor can see them.
120 123
 		$value = Image::regenerate_html_links($value);
@@ -182,6 +185,10 @@  discard block
 block discarded – undo
182 185
 
183 186
 	protected $controller, $name;
184 187
 
188
+	/**
189
+	 * @param Controller|null $controller
190
+	 * @param string $name
191
+	 */
185 192
 	public function __construct($controller, $name) {
186 193
 		parent::__construct();
187 194
 
@@ -200,7 +207,7 @@  discard block
 block discarded – undo
200 207
 	/**
201 208
 	 * Searches the SiteTree for display in the dropdown
202 209
 	 *
203
-	 * @return callback
210
+	 * @return DataList
204 211
 	 */
205 212
 	public function siteTreeSearchCallback($sourceObject, $labelField, $search) {
206 213
 		return DataObject::get($sourceObject)->filterAny(array(
@@ -580,7 +587,7 @@  discard block
 block discarded – undo
580 587
 	/**
581 588
 	 * Find all anchors available on the given page.
582 589
 	 *
583
-	 * @return array
590
+	 * @return string
584 591
 	 * @throws SS_HTTPResponse_Exception
585 592
 	 */
586 593
 	public function getanchors() {
@@ -1156,7 +1163,7 @@  discard block
 block discarded – undo
1156 1163
 	}
1157 1164
 
1158 1165
 	/**
1159
-	 * @return AdapterInterface
1166
+	 * @return Embed
1160 1167
 	 */
1161 1168
 	public function getEmbed() {
1162 1169
 		return $this->embed;
Please login to merge, or discard this patch.
forms/htmleditor/EmbedShortcodeProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	/**
23 23
 	 * Gets the list of shortcodes provided by this handler
24 24
 	 *
25
-	 * @return mixed
25
+	 * @return string[]
26 26
 	 */
27 27
 	public static function get_shortcodes()
28 28
 	{
Please login to merge, or discard this patch.