Completed
Pull Request — master (#6394)
by Ed
10:36
created
admin/thirdparty/tinymce-spellchecker/classes/GoogleSpell.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -118,6 +118,10 @@
 block discarded – undo
118 118
 
119 119
 // Patch in multibyte support
120 120
 if (!function_exists('mb_substr')) {
121
+
122
+	/**
123
+	 * @param string $str
124
+	 */
121 125
 	function mb_substr($str, $start, $len = '', $encoding="UTF-8"){
122 126
 		$limit = strlen($str);
123 127
 
Please login to merge, or discard this patch.
admin/thirdparty/tinymce-spellchecker/classes/SpellChecker.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 	/**
53 53
 	 * Throws an error message back to the user. This will stop all execution.
54 54
 	 *
55
-	 * @param {String} $str Message to send back to user.
55
+	 * @param string $str Message to send back to user.
56 56
 	 */
57 57
 	function throwError($str) {
58 58
 		die('{"result":null,"id":null,"error":{"errstr":"' . addslashes($str) . '","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}');
Please login to merge, or discard this patch.
admin/thirdparty/tinymce-spellchecker/classes/utils/JSON.php 1 patch
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -342,6 +342,9 @@  discard block
 block discarded – undo
342 342
 		return null;
343 343
 	}
344 344
 
345
+	/**
346
+	 * @param integer $len
347
+	 */
345 348
 	function skip($len) {
346 349
 		$this->_pos += $len;
347 350
 	}
@@ -369,6 +372,9 @@  discard block
 block discarded – undo
369 372
 		return $this->readValue($reader);
370 373
 	}
371 374
 
375
+	/**
376
+	 * @param Moxiecode_JSONReader $reader
377
+	 */
372 378
 	function readValue(&$reader) {
373 379
 		$this->data = array();
374 380
 		$this->parents = array();
@@ -554,6 +560,11 @@  discard block
 block discarded – undo
554 560
 		return '"' . $input . '"';
555 561
 	}
556 562
 
563
+	/**
564
+	 * @param string $utf8
565
+	 *
566
+	 * @return string
567
+	 */
557 568
 	function _utf82utf16($utf8) {
558 569
 		if (function_exists('mb_convert_encoding'))
559 570
 			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
Please login to merge, or discard this patch.
admin/thirdparty/tinymce-spellchecker/classes/utils/Logger.php 1 patch
Doc Comments   +16 added lines patch added patch discarded remove patch
@@ -86,6 +86,9 @@  discard block
 block discarded – undo
86 86
 		return $this->_level;
87 87
 	}
88 88
 
89
+	/**
90
+	 * @param string $path
91
+	 */
89 92
 	function setPath($path) {
90 93
 		$this->_path = $path;
91 94
 	}
@@ -102,6 +105,9 @@  discard block
 block discarded – undo
102 105
 		return $this->_filename;
103 106
 	}
104 107
 
108
+	/**
109
+	 * @param string $format
110
+	 */
105 111
 	function setFormat($format) {
106 112
 		$this->_format = $format;
107 113
 	}
@@ -110,6 +116,9 @@  discard block
 block discarded – undo
110 116
 		return $this->_format;
111 117
 	}
112 118
 
119
+	/**
120
+	 * @param string $size
121
+	 */
113 122
 	function setMaxSize($size) {
114 123
 		// Fix log max size
115 124
 		$logMaxSizeBytes = intval(preg_replace("/[^0-9]/", "", $size));
@@ -130,6 +139,9 @@  discard block
 block discarded – undo
130 139
 		return $this->_maxSize;
131 140
 	}
132 141
 
142
+	/**
143
+	 * @param string $max_files
144
+	 */
133 145
 	function setMaxFiles($max_files) {
134 146
 		$this->_maxFiles = $max_files;
135 147
 	}
@@ -183,6 +195,10 @@  discard block
 block discarded – undo
183 195
 		return $this->_level >= MC_LOGGER_FATAL;
184 196
 	}
185 197
 
198
+	/**
199
+	 * @param integer $level
200
+	 * @param string $message
201
+	 */
186 202
 	function _logMsg($level, $message) {
187 203
 		$roll = false;
188 204
 
Please login to merge, or discard this patch.
admin/thirdparty/tinymce/tiny_mce_gzip.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,6 @@  discard block
 block discarded – undo
83 83
 	/**
84 84
 	 * Adds a file to the concatenation/compression process.
85 85
 	 *
86
-	 * @param String $path Path to the file to include in the compressed package/output.
87 86
 	 */
88 87
 	public function &addFile($file) {
89 88
 		$this->files .= ($this->files ? "," : "") . $file;
@@ -256,7 +255,7 @@  discard block
 block discarded – undo
256 255
 	/**
257 256
 	 * Renders a script tag that loads the TinyMCE script.
258 257
 	 *
259
-	 * @param Array $settings Name/value array with settings for the script tag.
258
+	 * @param Array $tagSettings Name/value array with settings for the script tag.
260 259
 	 * @param Bool  $return   The script tag is return instead of being output if true
261 260
 	 * @return String the tag is returned if $return is true
262 261
 	 */
Please login to merge, or discard this patch.
src/Core/Core.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -161,6 +161,9 @@  discard block
 block discarded – undo
161 161
 	return Injector::inst()->get($className);
162 162
 }
163 163
 
164
+/**
165
+ * @return string
166
+ */
164 167
 function project() {
165 168
 	global $project;
166 169
 	return $project;
@@ -184,7 +187,7 @@  discard block
 block discarded – undo
184 187
  * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()},
185 188
  * and defaults to the 'memory_limit' setting in the PHP configuration.
186 189
  *
187
- * @param string|int $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
190
+ * @param integer $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
188 191
  * @return Boolean TRUE indicates a successful change, FALSE a denied change.
189 192
  */
190 193
 function increase_memory_limit_to($memoryLimit = -1) {
Please login to merge, or discard this patch.
tests/php/Assets/Storage/AssetStoreTest/TestStore.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -625,6 +625,9 @@  discard block
 block discarded – undo
625 625
 	}
626 626
 
627 627
 
628
+	/**
629
+	 * @param string $fileID
630
+	 */
628 631
 	public function getOriginalFilename($fileID) {
629 632
 		return parent::getOriginalFilename($fileID);
630 633
 	}
@@ -633,6 +636,9 @@  discard block
 block discarded – undo
633 636
 		return parent::removeVariant($fileID);
634 637
 	}
635 638
 
639
+	/**
640
+	 * @param null|string $variant
641
+	 */
636 642
 	public function getDefaultConflictResolution($variant) {
637 643
 		return parent::getDefaultConflictResolution($variant);
638 644
 	}
Please login to merge, or discard this patch.
tests/php/Core/Manifest/ConfigManifestTest.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 	/**
12 12
 	 * This is a helper method for getting a new manifest
13
-	 * @param $name
13
+	 * @param string $name
14 14
 	 * @return any
15 15
 	 */
16 16
 	protected function getConfigFixtureValue($name) {
@@ -20,6 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 	/**
22 22
 	 * This is a helper method for displaying a relevant message about a parsing failure
23
+	 * @param string $path
23 24
 	 */
24 25
 	protected function getParsedAsMessage($path) {
25 26
 		return sprintf('Reference path "%s" failed to parse correctly', $path);
@@ -41,7 +42,7 @@  discard block
 block discarded – undo
41 42
 
42 43
 	/**
43 44
 	 * A helper method to return a mock of the manifest in order to test expectations and reduce dependency
44
-	 * @param $methods
45
+	 * @param string[] $methods
45 46
 	 * @return SS_ConfigManifest
46 47
 	 */
47 48
 	protected function getManifestMock($methods) {
Please login to merge, or discard this patch.
tests/php/Core/ObjectTest/Extending.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -619,6 +619,11 @@
 block discarded – undo
619 619
 		'ObjectTest_Extending_Extension'
620 620
 	);
621 621
 
622
+	/**
623
+	 * @param integer $first
624
+	 * @param integer $second
625
+	 * @param integer $third
626
+	 */
622 627
 	public function getResults(&$first, &$second, &$third) {
623 628
 		// Before extending should be invoked second
624 629
 		$this->beforeExtending('updateResult', function(&$first, &$second, &$third) {
Please login to merge, or discard this patch.