Completed
Pull Request — 3.4 (#6522)
by Chris
09:33
created
view/ViewableData.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -189,8 +189,6 @@  discard block
 block discarded – undo
189 189
 	/**
190 190
 	 * Method to facilitate deprecation of underscore-prefixed methods automatically being cached.
191 191
 	 *
192
-	 * @param string $field
193
-	 * @param array $arguments
194 192
 	 * @param string $identifier an optional custom cache identifier
195 193
 	 * @return unknown
196 194
 	 */
@@ -251,7 +249,7 @@  discard block
 block discarded – undo
251 249
 	 *  - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)")
252 250
 	 *
253 251
 	 * @param string $field
254
-	 * @return array
252
+	 * @return string
255 253
 	 */
256 254
 	public function castingHelperPair($field) {
257 255
 		Deprecation::notice('2.5', 'use castingHelper() instead');
@@ -501,6 +499,7 @@  discard block
 block discarded – undo
501 499
 
502 500
 	/**
503 501
 	 * Return the value of a field in an SQL-safe format.
502
+	 * @param string $field
504 503
 	 */
505 504
 	public function SQL_val($field, $arguments = null, $cache = true) {
506 505
 		return Convert::raw2sql($this->RAW_val($field, $arguments, $cache));
@@ -508,6 +507,7 @@  discard block
 block discarded – undo
508 507
 
509 508
 	/**
510 509
 	 * Return the value of a field in a JavaScript-save format.
510
+	 * @param string $field
511 511
 	 */
512 512
 	public function JS_val($field, $arguments = null, $cache = true) {
513 513
 		return Convert::raw2js($this->RAW_val($field, $arguments, $cache));
@@ -515,6 +515,7 @@  discard block
 block discarded – undo
515 515
 
516 516
 	/**
517 517
 	 * Return the value of a field escaped suitable to be inserted into an XML node attribute.
518
+	 * @param string $field
518 519
 	 */
519 520
 	public function ATT_val($field, $arguments = null, $cache = true) {
520 521
 		return Convert::raw2att($this->RAW_val($field, $arguments, $cache));
@@ -525,7 +526,6 @@  discard block
 block discarded – undo
525 526
 	/**
526 527
 	 * Get an array of XML-escaped values by field name
527 528
 	 *
528
-	 * @param array $elements an array of field names
529 529
 	 * @return array
530 530
 	 */
531 531
 	public function getXMLValues($fields) {
Please login to merge, or discard this patch.
dev/SilverStripeListener.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
36 36
 
37 37
 	protected $whitelist = false;
38 38
 
39
+	/**
40
+	 * @param string $name
41
+	 */
39 42
 	public function __construct($name = null, $options = array()) {
40 43
 		if(is_string($options)) {
41 44
 			$options = array('whitelist' => $options);
Please login to merge, or discard this patch.
forms/DropdownField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 	/**
11 11
 	 * @param array $properties
12 12
 	 *
13
-	 * @return HTMLText
13
+	 * @return string
14 14
 	 */
15 15
 	public function FieldHolder($properties = array()) {
16 16
 		return $this->Field($properties);
Please login to merge, or discard this patch.
thirdparty/jstree/_demo/_inc/class._database.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -97,6 +97,9 @@
 block discarded – undo
97 97
 		return $return;
98 98
 	}
99 99
 
100
+	/**
101
+	 * @param boolean $index
102
+	 */
100 103
 	function f($index) {
101 104
 		return stripslashes($this->row[$index]);
102 105
 	}
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Qt.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
49 49
      *                            see Zend_Locale for more information
50 50
      * @param  string  $filename  XMLTM file to add, full path must be given for access
51
-     * @param  array   $option    OPTIONAL Options to use
51
+     * @param  array   $options    OPTIONAL Options to use
52 52
      * @throws Zend_Translation_Exception
53 53
      * @return array
54 54
      */
@@ -116,6 +116,9 @@  discard block
 block discarded – undo
116 116
         }
117 117
     }
118 118
 
119
+    /**
120
+     * @param string $filename
121
+     */
119 122
     private function _findEncoding($filename)
120 123
     {
121 124
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Tbx.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
49 49
      *                            see Zend_Locale for more information
50 50
      * @param  string  $filename  XMLTM file to add, full path must be given for access
51
-     * @param  array   $option    OPTIONAL Options to use
51
+     * @param  array   $options    OPTIONAL Options to use
52 52
      * @throws Zend_Translation_Exception
53 53
      * @return array
54 54
      */
@@ -116,6 +116,9 @@  discard block
 block discarded – undo
116 116
         }
117 117
     }
118 118
 
119
+    /**
120
+     * @param string $filename
121
+     */
119 122
     private function _findEncoding($filename)
120 123
     {
121 124
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
thirdparty/Zend/Translate/Adapter/Xliff.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
      * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
49 49
      *                            see Zend_Locale for more information
50 50
      * @param  string  $filename  XMLTM file to add, full path must be given for access
51
-     * @param  array   $option    OPTIONAL Options to use
51
+     * @param  array   $options    OPTIONAL Options to use
52 52
      * @throws Zend_Translation_Exception
53 53
      * @return array
54 54
      */
@@ -116,6 +116,9 @@  discard block
 block discarded – undo
116 116
         }
117 117
     }
118 118
 
119
+    /**
120
+     * @param string $filename
121
+     */
119 122
     private function _findEncoding($filename)
120 123
     {
121 124
         $file = file_get_contents($filename, null, null, 0, 100);
Please login to merge, or discard this patch.
admin/code/CMSForm.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -53,6 +53,7 @@
 block discarded – undo
53 53
 	 * Set actions that are exempt from validation
54 54
 	 *
55 55
 	 * @param array
56
+	 * @param string[] $actions
56 57
 	 */
57 58
 	public function setValidationExemptActions($actions) {
58 59
 		$this->validationExemptActions = $actions;
Please login to merge, or discard this patch.
control/Controller.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -322,6 +322,9 @@  discard block
 block discarded – undo
322 322
 		return new SSViewer($templates);
323 323
 	}
324 324
 
325
+	/**
326
+	 * @param string $action
327
+	 */
325 328
 	public function hasAction($action) {
326 329
 		return parent::hasAction($action) || $this->hasActionTemplate($action);
327 330
 	}
@@ -385,7 +388,7 @@  discard block
 block discarded – undo
385 388
 	 * by {@link getViewer()}.
386 389
 	 *
387 390
 	 * @param array $params Key-value array for custom template variables (Optional)
388
-	 * @return string Parsed template content
391
+	 * @return HTMLText Parsed template content
389 392
 	 */
390 393
 	public function render($params = null) {
391 394
 		$template = $this->getViewer($this->getAction());
@@ -540,7 +543,7 @@  discard block
 block discarded – undo
540 543
 
541 544
 	/**
542 545
 	 * Tests whether a redirection has been requested.
543
-	 * @return string If redirect() has been called, it will return the URL redirected to.  Otherwise, it will
546
+	 * @return boolean If redirect() has been called, it will return the URL redirected to.  Otherwise, it will
544 547
 	 * return null;
545 548
 	 */
546 549
 	public function redirectedTo() {
Please login to merge, or discard this patch.