Completed
Pull Request — master (#5536)
by Simon
18:12 queued 06:46
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.
api/RSSFeed.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 	 *
192 192
 	 * TODO: Pass $response object to ->outputToBrowser() to loosen dependence on global state for easier testing/prototyping so dev can inject custom SS_HTTPResponse instance.
193 193
 	 *
194
-	 * @return	HTMLText
194
+	 * @return	DBField
195 195
 	 */
196 196
 	public function outputToBrowser() {
197 197
 		$prevState = Config::inst()->get('SSViewer', 'source_file_comments');
@@ -222,6 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * via the standard template inclusion process.
223 223
 	 *
224 224
 	 * @param string
225
+	 * @param string $template
225 226
 	 */
226 227
 	public function setTemplate($template) {
227 228
 		$this->template = $template;
@@ -318,6 +319,7 @@  discard block
 block discarded – undo
318 319
 	/**
319 320
 	 * Return the named field as an obj() call from $this->failover.
320 321
 	 * Default to the given class if there's no casting information.
322
+	 * @param string $fieldName
321 323
 	 */
322 324
 	public function rssField($fieldName, $defaultClass = 'Varchar') {
323 325
 		if($fieldName) {
Please login to merge, or discard this patch.
model/DataObject.php 1 patch
Doc Comments   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -558,8 +558,8 @@  discard block
 block discarded – undo
558 558
 
559 559
 	/**
560 560
 	 * Helper function to duplicate relations from one object to another
561
-	 * @param $sourceObject the source object to duplicate from
562
-	 * @param $destinationObject the destination object to populate with the duplicated relations
561
+	 * @param DataObject $sourceObject the source object to duplicate from
562
+	 * @param DataObject $destinationObject the destination object to populate with the duplicated relations
563 563
 	 * @param $name the name of the relation to duplicate (e.g. members)
564 564
 	 */
565 565
 	private function duplicateRelations($sourceObject, $destinationObject, $name) {
@@ -957,6 +957,7 @@  discard block
 block discarded – undo
957 957
 	 * @param $includeRelations Boolean Merge any existing relations (optional)
958 958
 	 * @param $overwriteWithEmpty Boolean Overwrite existing left values with empty right values.
959 959
 	 *                            Only applicable with $priority='right'. (optional)
960
+	 * @param DataObject|null $rightObj
960 961
 	 * @return Boolean
961 962
 	 */
962 963
 	public function merge($rightObj, $priority = 'right', $includeRelations = true, $overwriteWithEmpty = false) {
@@ -2243,6 +2244,7 @@  discard block
 block discarded – undo
2243 2244
 	 *
2244 2245
 	 * This is experimental, and is currently only a Postgres-specific enhancement.
2245 2246
 	 *
2247
+	 * @param string $class
2246 2248
 	 * @return array or false
2247 2249
 	 */
2248 2250
 	public function database_extensions($class){
@@ -2721,6 +2723,7 @@  discard block
 block discarded – undo
2721 2723
 
2722 2724
 	/**
2723 2725
 	 * {@inheritdoc}
2726
+	 * @param string $field
2724 2727
 	 */
2725 2728
 	public function castingHelper($field) {
2726 2729
 		if ($fieldSpec = $this->db($field)) {
@@ -3067,7 +3070,7 @@  discard block
 block discarded – undo
3067 3070
 	 * Traverses to a field referenced by relationships between data objects, returning the value
3068 3071
 	 * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
3069 3072
 	 *
3070
-	 * @param $fieldName string
3073
+	 * @param string $fieldName string
3071 3074
 	 * @return string | null - will return null on a missing value
3072 3075
 	 */
3073 3076
 	public function relField($fieldName) {
@@ -3136,7 +3139,7 @@  discard block
 block discarded – undo
3136 3139
 	 * @param string $callerClass The class of objects to be returned
3137 3140
 	 * @param string|array $filter A filter to be inserted into the WHERE clause.
3138 3141
 	 * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
3139
-	 * @param string|array $sort A sort expression to be inserted into the ORDER
3142
+	 * @param string $sort A sort expression to be inserted into the ORDER
3140 3143
 	 * BY clause.  If omitted, self::$default_sort will be used.
3141 3144
 	 * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
3142 3145
 	 * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
@@ -3346,6 +3349,8 @@  discard block
 block discarded – undo
3346 3349
 	/**
3347 3350
 	 * @see $sourceQueryParams
3348 3351
 	 * @param array
3352
+	 * @param string $key
3353
+	 * @param string $value
3349 3354
 	 */
3350 3355
 	public function setSourceQueryParam($key, $value) {
3351 3356
 		$this->sourceQueryParams[$key] = $value;
@@ -3353,6 +3358,7 @@  discard block
 block discarded – undo
3353 3358
 
3354 3359
 	/**
3355 3360
 	 * @see $sourceQueryParams
3361
+	 * @param string $key
3356 3362
 	 * @return Mixed
3357 3363
 	 */
3358 3364
 	public function getSourceQueryParam($key) {
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.