@@ -32,6 +32,7 @@ |
||
| 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(); |
@@ -85,6 +85,10 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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(); |
@@ -28,6 +28,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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; |
@@ -66,6 +66,7 @@ |
||
| 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()) { |
@@ -208,6 +208,8 @@ |
||
| 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); |
@@ -10,7 +10,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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) { |
@@ -9,6 +9,10 @@ |
||
| 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 | } |
@@ -222,6 +222,9 @@ |
||
| 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++; |
@@ -47,6 +47,9 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | |
| 50 | + /** |
|
| 51 | + * @param string $url |
|
| 52 | + */ |
|
| 50 | 53 | protected function getCapture($url){ |
| 51 | 54 | $this->logInWithPermission('ADMIN'); |
| 52 | 55 | |
@@ -58,6 +61,9 @@ discard block |
||
| 58 | 61 | return $r; |
| 59 | 62 | } |
| 60 | 63 | |
| 64 | + /** |
|
| 65 | + * @param string $url |
|
| 66 | + */ |
|
| 61 | 67 | protected function getAndCheckForError($url){ |
| 62 | 68 | $this->logInWithPermission('ADMIN'); |
| 63 | 69 | |