@@ -42,6 +42,9 @@ discard block |
||
42 | 42 | ); |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param string $action |
|
47 | + */ |
|
45 | 48 | public function Link($action = null) { |
46 | 49 | return Controller::join_links(Director::baseURL(), "CMSSecurity", $action); |
47 | 50 | } |
@@ -57,6 +60,9 @@ discard block |
||
57 | 60 | } |
58 | 61 | } |
59 | 62 | |
63 | + /** |
|
64 | + * @param string $title |
|
65 | + */ |
|
60 | 66 | public function getResponseController($title) { |
61 | 67 | // Use $this to prevent use of Page to render underlying templates |
62 | 68 | return $this; |
@@ -172,6 +178,9 @@ discard block |
||
172 | 178 | user_error('Passed invalid authentication method', E_USER_ERROR); |
173 | 179 | } |
174 | 180 | |
181 | + /** |
|
182 | + * @param string $action |
|
183 | + */ |
|
175 | 184 | public function getTemplatesFor($action) { |
176 | 185 | return array("CMSSecurity_{$action}", "CMSSecurity") |
177 | 186 | + parent::getTemplatesFor($action); |
@@ -331,6 +331,7 @@ |
||
331 | 331 | * Overloaded to ensure the code is always descent. |
332 | 332 | * |
333 | 333 | * @param string |
334 | + * @param string $val |
|
334 | 335 | */ |
335 | 336 | public function setCode($val){ |
336 | 337 | $this->setField("Code", Convert::raw2url($val)); |
@@ -134,7 +134,7 @@ discard block |
||
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 |
||
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 |
@@ -47,7 +47,6 @@ |
||
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) { |
@@ -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); |