Completed
Pull Request — 3.6 (#8611)
by Loz
10:02
created
security/PasswordValidator.php 1 patch
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,6 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 	/**
30 30
 	 * Minimum password length
31
+	 * @param integer $minLength
31 32
 	 */
32 33
 	public function minLength($minLength) {
33 34
 		$this->minLength = $minLength;
@@ -39,8 +40,8 @@  discard block
 block discarded – undo
39 40
 	 *
40 41
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
41 42
 	 *
42
-	 * @param $minScore The minimum number of character tests that must pass
43
-	 * @param $testNames The names of the tests to perform
43
+	 * @param integer $minScore The minimum number of character tests that must pass
44
+	 * @param string[] $testNames The names of the tests to perform
44 45
 	 */
45 46
 	public function characterStrength($minScore, $testNames) {
46 47
 		$this->minScore = $minScore;
@@ -50,6 +51,7 @@  discard block
 block discarded – undo
50 51
 
51 52
 	/**
52 53
 	 * Check a number of previous passwords that the user has used, and don't let them change to that.
54
+	 * @param integer $count
53 55
 	 */
54 56
 	public function checkHistoricalPasswords($count) {
55 57
 		$this->historicalPasswordCount = $count;
Please login to merge, or discard this patch.
security/Permission.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
 	 * Recursively traverse the nested list of declared permissions and create
653 653
 	 * a linear list.
654 654
 	 *
655
-	 * @param aeeay $declared Nested structure of permissions.
655
+	 * @param boolean $declared Nested structure of permissions.
656 656
 	 * @param $list List of permissions in the structure. The result will be
657 657
 	 *              written to this array.
658 658
 	 */
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
740 740
 	/**
741 741
 	 * Get permissions
742 742
 	 *
743
-	 * @return array Associative array of permissions in this permission
743
+	 * @return string Associative array of permissions in this permission
744 744
 	 *               group. The array indicies are the permission codes as
745 745
 	 *               used in {@link Permission::check()}. The value is
746 746
 	 *               suitable for using in an interface.
Please login to merge, or discard this patch.
tasks/EncryptAllPasswordsTask.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -66,6 +66,7 @@
 block discarded – undo
66 66
 
67 67
 	/**
68 68
 	 * @todo This should really be taken care of by TestRunner
69
+	 * @param string $msg
69 70
 	 */
70 71
 	protected function debugMessage($msg) {
71 72
 		if(class_exists('SapphireTest', false) && !SapphireTest::is_running_test()) {
Please login to merge, or discard this patch.
tests/api/RestfulServiceTest.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -208,6 +208,8 @@
 block discarded – undo
208 208
 	 * Simulate cached response file for testing error requests that are supposed to have cache files
209 209
 	 *
210 210
 	 * @todo Generate the cachepath without hardcoding the cache data
211
+	 * @param RestfulServiceTest_MockErrorService $connection
212
+	 * @param string $subUrl
211 213
 	 */
212 214
 	private function createFakeCachedResponse($connection, $subUrl) {
213 215
 		$fullUrl = $connection->getAbsoluteRequestURL($subUrl);
Please login to merge, or discard this patch.
tests/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/core/manifest/ManifestFileFinderTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -14,6 +14,10 @@
 block discarded – undo
14 14
 		parent::__construct();
15 15
 	}
16 16
 
17
+	/**
18
+	 * @param ManifestFileFinder $finder
19
+	 * @param string[] $expect
20
+	 */
17 21
 	public function assertFinderFinds($finder, $expect, $message = null) {
18 22
 		$found = $finder->find($this->base);
19 23
 
Please login to merge, or discard this patch.
tests/core/manifest/TemplateLoaderTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -174,12 +174,18 @@
 block discarded – undo
174 174
 		$this->loader->pushManifest($this->manifest);
175 175
 	}
176 176
 
177
+	/**
178
+	 * @param string[] $templates
179
+	 */
177 180
 	protected function createTestTemplates($templates) {
178 181
 		foreach ($templates as $template) {
179 182
 			file_put_contents($template, '');
180 183
 		}
181 184
 	}
182 185
 
186
+	/**
187
+	 * @param string[] $templates
188
+	 */
183 189
 	protected function removeTestTemplates($templates) {
184 190
 		foreach ($templates as $template) {
185 191
 			unlink($template);
Please login to merge, or discard this patch.
tests/core/startup/ParameterConfirmationTokenTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -23,6 +23,9 @@
 block discarded – undo
23 23
 
24 24
 class ParameterConfirmationTokenTest extends SapphireTest {
25 25
 
26
+	/**
27
+	 * @param string $part
28
+	 */
26 29
 	private function addPart($answer, $slash, $part) {
27 30
 		$bare = str_replace('/', '', $part);
28 31
 
Please login to merge, or discard this patch.
tests/dev/CsvBulkLoaderTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -222,6 +222,9 @@
 block discarded – undo
222 222
 	}
223 223
 
224 224
 
225
+	/**
226
+	 * @param resource $file
227
+	 */
225 228
 	protected function getLineCount(&$file) {
226 229
 		$i = 0;
227 230
 		while(fgets($file) !== false) $i++;
Please login to merge, or discard this patch.