Completed
Pull Request — master (#5258)
by Sean
11:38
created
security/MemberAuthenticator.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @param Form $form Optional: If passed, better error messages can be
135 135
 	 *                             produced by using
136 136
 	 *                             {@link Form::sessionMessage()}
137
-	 * @return bool|Member Returns FALSE if authentication fails, otherwise
137
+	 * @return Member|null Returns FALSE if authentication fails, otherwise
138 138
 	 *                     the member object
139 139
 	 * @see Security::setDefaultAdmin()
140 140
 	 */
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	/**
166 166
 	 * Method that creates the login form for this authentication method
167 167
 	 *
168
-	 * @param Controller The parent controller, necessary to create the
168
+	 * @param Controller Controller parent controller, necessary to create the
169 169
 	 *                   appropriate form action tag
170 170
 	 * @return Form Returns the login form to use with this authentication
171 171
 	 *              method
Please login to merge, or discard this patch.
security/MemberLoginForm.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,6 @@
 block discarded – undo
47 47
 	 * @param bool $checkCurrentUser If set to TRUE, it will be checked if a
48 48
 	 *                               the user is currently logged in, and if
49 49
 	 *                               so, only a logout button will be rendered
50
-	 * @param string $authenticatorClassName Name of the authenticator class that this form uses.
51 50
 	 */
52 51
 	public function __construct($controller, $name, $fields = null, $actions = null,
53 52
 								$checkCurrentUser = true) {
Please login to merge, or discard this patch.
security/MemberPassword.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -32,6 +32,7 @@
 block discarded – undo
32 32
 	/**
33 33
 	 * Log a password change from the given member.
34 34
 	 * Call MemberPassword::log($this) from within Member whenever the password is changed.
35
+	 * @param Member $member
35 36
 	 */
36 37
 	public static function log($member) {
37 38
 		$record = new MemberPassword();
Please login to merge, or discard this patch.
security/PasswordEncryptor.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,6 +85,10 @@  discard block
 block discarded – undo
85 85
 	 * but is necessary for retain compatibility with password hashed
86 86
 	 * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and
87 87
 	 * {@link PasswordEncryptor_Blowfish}
88
+	 * @param string $hash
89
+	 * @param string $password
90
+	 * @param string $salt
91
+	 * @param Member $member
88 92
 	 */
89 93
 	public function check($hash, $password, $salt = null, $member = null) {
90 94
 		return $hash === $this->encrypt($password, $salt, $member);
@@ -127,8 +131,7 @@  discard block
 block discarded – undo
127 131
 	/**
128 132
 	 * Gets the cost that is set for the blowfish algorithm
129 133
 	 *
130
-	 * @param int $cost
131
-	 * @return null
134
+	 * @return integer
132 135
 	 */
133 136
 	public static function get_cost() {
134 137
 		return self::$cost;
@@ -240,6 +243,7 @@  discard block
 block discarded – undo
240 243
 
241 244
 	/**
242 245
 	 * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
246
+	 * @param string $password
243 247
 	 */
244 248
 	public function salt($password, $member = null) {
245 249
 		$generator = new RandomGenerator();
Please login to merge, or discard this patch.
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.
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/startup/ErrorControlChainTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -9,6 +9,10 @@
 block discarded – undo
9 9
 class ErrorControlChainTest_Chain extends ErrorControlChain {
10 10
 
11 11
 	// Change function visibility to be testable directly
12
+
13
+	/**
14
+	 * @param string $memstring
15
+	 */
12 16
 	public function translateMemstring($memstring) {
13 17
 		return parent::translateMemstring($memstring);
14 18
 	}
Please login to merge, or discard this patch.