Completed
Pull Request — 3.7 (#8242)
by Sam
09:16
created
model/fieldtypes/Currency.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -23,6 +23,9 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	private static $currency_symbol = '$';
25 25
 
26
+	/**
27
+	 * @param string $name
28
+	 */
26 29
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
27 30
 		parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
28 31
 	}
@@ -46,6 +49,9 @@  discard block
 block discarded – undo
46 49
 		else return $val;
47 50
 	}
48 51
 
52
+	/**
53
+	 * @param string $value
54
+	 */
49 55
 	public function setValue($value, $record = null) {
50 56
 		$matches = null;
51 57
 		if(is_numeric($value)) {
Please login to merge, or discard this patch.
model/fieldtypes/Date.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,6 +28,9 @@  discard block
 block discarded – undo
28 28
 	private static $nice_format = 'd/m/Y';
29 29
 
30 30
 
31
+	/**
32
+	 * @param string|null $value
33
+	 */
31 34
 	public function setValue($value, $record = null) {
32 35
 		if($value === false || $value === null || (is_string($value) && !strlen($value))) {
33 36
 			// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be
@@ -110,7 +113,7 @@  discard block
 block discarded – undo
110 113
 
111 114
 	/**
112 115
 	 * Returns the day of the month.
113
-	 * @param boolean $includeOrdinals Include ordinal suffix to day, e.g. "th" or "rd"
116
+	 * @param boolean $includeOrdinal Include ordinal suffix to day, e.g. "th" or "rd"
114 117
 	 * @return string
115 118
 	 */
116 119
 	public function DayOfMonth($includeOrdinal = false) {
@@ -164,7 +167,7 @@  discard block
 block discarded – undo
164 167
 	 * Return a date formatted as per a CMS user's settings.
165 168
 	 *
166 169
 	 * @param Member $member
167
-	 * @return boolean | string A date formatted as per user-defined settings.
170
+	 * @return false|string | string A date formatted as per user-defined settings.
168 171
 	 */
169 172
 	public function FormatFromSettings($member = null) {
170 173
 		require_once 'Zend/Date.php';
Please login to merge, or discard this patch.
model/fieldtypes/DBField.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -209,6 +209,9 @@
 block discarded – undo
209 209
 
210 210
 	}
211 211
 
212
+	/**
213
+	 * @param string $tableName
214
+	 */
212 215
 	public function setTable($tableName) {
213 216
 		$this->tableName = $tableName;
214 217
 	}
Please login to merge, or discard this patch.
model/URLSegmentFilter.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -129,6 +129,7 @@
 block discarded – undo
129 129
 
130 130
 	/**
131 131
 	 * @param boolean
132
+	 * @param boolean $bool
132 133
 	 */
133 134
 	public function setAllowMultibyte($bool) {
134 135
 		$this->allowMultibyte = $bool;
Please login to merge, or discard this patch.
thirdparty/jstree/_demo/_inc/class._database_i.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -92,6 +92,9 @@
 block discarded – undo
92 92
 		return $return;
93 93
 	}
94 94
 
95
+	/**
96
+	 * @param boolean $index
97
+	 */
95 98
 	function f($index) {
96 99
 		return stripslashes($this->row[$index]);
97 100
 	}
Please login to merge, or discard this patch.
view/Requirements.php 1 patch
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,6 +63,7 @@  discard block
 block discarded – undo
63 63
 	 * while automatically busting this cache every time the file is changed.
64 64
 	 *
65 65
 	 * @param bool
66
+	 * @param boolean $var
66 67
 	 */
67 68
 	public static function set_suffix_requirements($var) {
68 69
 		self::backend()->set_suffix_requirements($var);
@@ -123,7 +124,7 @@  discard block
 block discarded – undo
123 124
 	/**
124 125
 	 * Return all registered custom scripts
125 126
 	 *
126
-	 * @return array
127
+	 * @return string
127 128
 	 */
128 129
 	public static function get_custom_scripts() {
129 130
 		return self::backend()->get_custom_scripts();
@@ -531,7 +532,7 @@  discard block
 block discarded – undo
531 532
 	/**
532 533
 	 * Enable or disable the combination of CSS and JavaScript files
533 534
 	 *
534
-	 * @param $enable
535
+	 * @param boolean $enable
535 536
 	 */
536 537
 	public function set_combined_files_enabled($enable) {
537 538
 		$this->combined_files_enabled = (bool) $enable;
@@ -599,6 +600,7 @@  discard block
 block discarded – undo
599 600
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
600 601
 	 *
601 602
 	 * @param bool
603
+	 * @param boolean $var
602 604
 	 */
603 605
 	public function set_force_js_to_bottom($var) {
604 606
 		$this->force_js_to_bottom = $var;
@@ -638,7 +640,7 @@  discard block
 block discarded – undo
638 640
 	/**
639 641
 	 * Return all registered custom scripts
640 642
 	 *
641
-	 * @return array
643
+	 * @return string
642 644
 	 */
643 645
 	public function get_custom_scripts() {
644 646
 		$requirements = "";
@@ -1051,7 +1053,7 @@  discard block
 block discarded – undo
1051 1053
 	 * @param array  $files            Array of filenames relative to docroot
1052 1054
 	 * @param string $media
1053 1055
 	 *
1054
-	 * @return bool|void
1056
+	 * @return false|null
1055 1057
 	 */
1056 1058
 	public function combine_files($combinedFileName, $files, $media = null) {
1057 1059
 		// duplicate check
Please login to merge, or discard this patch.
core/Convert.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @param array|string $val String to escape, or array of strings
52 52
 	 *
53
-	 * @return array|string
53
+	 * @return string
54 54
 	 */
55 55
 	public static function raw2htmlname($val) {
56 56
 		if(is_array($val)) {
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 *
182 182
 	 * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title'
183 183
 	 * @param string $separator The string that delimits subsequent identifiers
184
-	 * @return string|array The escaped identifier. E.g. '"SiteTree"."Title"'
184
+	 * @return string The escaped identifier. E.g. '"SiteTree"."Title"'
185 185
 	 */
186 186
 	public static function symbol2sql($identifier, $separator = '.') {
187 187
 		if(is_array($identifier)) {
@@ -266,6 +266,7 @@  discard block
 block discarded – undo
266 266
 	 * call this function directly, Please use {@link Convert::xml2array()}
267 267
 	 *
268 268
 	 * @param SimpleXMLElement
269
+	 * @param SimpleXMLElement $xml
269 270
 	 *
270 271
 	 * @return mixed
271 272
 	 */
Please login to merge, or discard this patch.
filesystem/File.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 * Find a File object by the given filename.
235 235
 	 *
236 236
 	 * @param String $filename Matched against the "Name" property.
237
-	 * @return mixed null if not found, File object of found file
237
+	 * @return null|DataObject null if not found, File object of found file
238 238
 	 */
239 239
 	public static function find($filename) {
240 240
 		// Get the base file if $filename points to a resampled file
@@ -449,6 +449,7 @@  discard block
 block discarded – undo
449 449
 	 * showing icons on filelinks, etc.
450 450
 	 * Possible group values are: "audio", "mov", "zip", "image".
451 451
 	 *
452
+	 * @param string $ext
452 453
 	 * @return String
453 454
 	 */
454 455
 	public static function get_app_category($ext) {
Please login to merge, or discard this patch.
filesystem/GD.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -150,6 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * successfully, the manipulation's cache key is removed.
151 151
 	 *
152 152
 	 * @param string $filename
153
+	 * @param string $manipulation
153 154
 	 * @return boolean
154 155
 	 */
155 156
 	public function failedResample($filename, $manipulation) {
@@ -428,6 +429,10 @@  discard block
 block discarded – undo
428 429
 			return $useAsMinimum ? $this->resizeByWidth( $maxWidth ) : $this->resizeByHeight( $maxHeight );
429 430
 	}
430 431
 
432
+	/**
433
+	 * @param resource $image
434
+	 * @param string $webColor
435
+	 */
431 436
 	public static function color_web2gd($image, $webColor, $transparencyPercent = 0) {
432 437
 		if(substr($webColor,0,1) == "#") $webColor = substr($webColor,1);
433 438
 		$r = hexdec(substr($webColor,0,2));
@@ -546,6 +551,9 @@  discard block
 block discarded – undo
546 551
 		return $output;
547 552
 	}
548 553
 
554
+	/**
555
+	 * @param string $dirname
556
+	 */
549 557
 	public function makeDir($dirname) {
550 558
 		if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname));
551 559
 		if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask'));
Please login to merge, or discard this patch.