@@ -40,6 +40,11 @@ |
||
| 40 | 40 | $this->internalCheck("domain.but.no.user", "Invalid, no user part", false); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | + /** |
|
| 44 | + * @param string $email |
|
| 45 | + * @param string $checkText |
|
| 46 | + * @param boolean $expectSuccess |
|
| 47 | + */ |
|
| 43 | 48 | public function internalCheck($email, $checkText, $expectSuccess) |
| 44 | 49 | { |
| 45 | 50 | $field = new EmailField("MyEmail"); |
@@ -14,6 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * Small helper to render templates from strings |
| 16 | 16 | * Cloned from SSViewerTest |
| 17 | + * @param string $templateString |
|
| 17 | 18 | */ |
| 18 | 19 | private function render($templateString, $data = null) |
| 19 | 20 | { |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | /** |
| 312 | 312 | * Assign value posted from form submission |
| 313 | 313 | * |
| 314 | - * @param mixed $value |
|
| 314 | + * @param string $value |
|
| 315 | 315 | * @param mixed $data |
| 316 | 316 | * @return $this |
| 317 | 317 | */ |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | * |
| 337 | 337 | * When $html5=true, assign value from ISO 8601 string. |
| 338 | 338 | * |
| 339 | - * @param mixed $value |
|
| 339 | + * @param string $value |
|
| 340 | 340 | * @param mixed $data |
| 341 | 341 | * @return $this |
| 342 | 342 | */ |
@@ -53,6 +53,7 @@ |
||
| 53 | 53 | * @param $message |
| 54 | 54 | * @param bool &$success Success flag |
| 55 | 55 | * @param null|Member $member If the parent method already identified the member, it can be passed in |
| 56 | + * @param null|boolean $success |
|
| 56 | 57 | * @return Member Found member, regardless of successful login |
| 57 | 58 | */ |
| 58 | 59 | protected function authenticateMember($data, &$message, &$success, $member = null) |
@@ -479,6 +479,7 @@ |
||
| 479 | 479 | * |
| 480 | 480 | * @When /^(?:|I )fill in the "(?P<field>(?:[^"]|\\")*)" dropdown with "(?P<value>(?:[^"]|\\")*)"$/ |
| 481 | 481 | * @When /^(?:|I )fill in "(?P<value>(?:[^"]|\\")*)" for the "(?P<field>(?:[^"]|\\")*)" dropdown$/ |
| 482 | + * @param string $field |
|
| 482 | 483 | */ |
| 483 | 484 | public function theIFillInTheDropdownWith($field, $value) |
| 484 | 485 | { |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | - * @param $bool |
|
| 138 | + * @param boolean $bool |
|
| 139 | 139 | * @return $this |
| 140 | 140 | */ |
| 141 | 141 | public function setHTML5($bool) |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | * Assign value posted from form submission, based on {@link $datetimeFormat}. |
| 149 | 149 | * When $html5=true, this needs to be normalised ISO format (with "T" separator). |
| 150 | 150 | * |
| 151 | - * @param mixed $value |
|
| 151 | + * @param string $value |
|
| 152 | 152 | * @param mixed $data |
| 153 | 153 | * @return $this |
| 154 | 154 | */ |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * When $html5=true, assign value from ISO 8601 normalised string (with a "T" separator). |
| 315 | 315 | * Falls back to an ISO 8601 string (with a whitespace separator). |
| 316 | 316 | * |
| 317 | - * @param mixed $value |
|
| 317 | + * @param string $value |
|
| 318 | 318 | * @param mixed $data |
| 319 | 319 | * @return $this |
| 320 | 320 | */ |
@@ -489,6 +489,9 @@ discard block |
||
| 489 | 489 | return $this; |
| 490 | 490 | } |
| 491 | 491 | |
| 492 | + /** |
|
| 493 | + * @param boolean $bool |
|
| 494 | + */ |
|
| 492 | 495 | public function setReadonly($bool) |
| 493 | 496 | { |
| 494 | 497 | parent::setReadonly($bool); |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * Find an attribute in a SimpleXMLElement object by name. |
| 231 | 231 | * @param SimpleXMLElement $object |
| 232 | 232 | * @param string $attribute Name of attribute to find |
| 233 | - * @return SimpleXMLElement object of the attribute |
|
| 233 | + * @return boolean object of the attribute |
|
| 234 | 234 | */ |
| 235 | 235 | public function findAttribute($object, $attribute) |
| 236 | 236 | { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
| 265 | 265 | * |
| 266 | 266 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 267 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
| 267 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
| 268 | 268 | * @param string $message |
| 269 | 269 | * @throws PHPUnit_Framework_AssertionFailedError |
| 270 | 270 | */ |
@@ -419,7 +419,6 @@ discard block |
||
| 419 | 419 | /** |
| 420 | 420 | * Log in as the given member |
| 421 | 421 | * |
| 422 | - * @param Member|int|string $member The ID, fixture codename, or Member object of the member that you want to log in |
|
| 423 | 422 | */ |
| 424 | 423 | public function logOut() |
| 425 | 424 | { |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | /** |
| 37 | 37 | * Set the name of the cookie used to track this device |
| 38 | 38 | * |
| 39 | - * @param string $cookieName |
|
| 39 | + * @param string $deviceCookieName |
|
| 40 | 40 | * @return null |
| 41 | 41 | */ |
| 42 | 42 | public function setDeviceCookieName($deviceCookieName) |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | /** |
| 58 | 58 | * Set the name of the cookie used to store an login token |
| 59 | 59 | * |
| 60 | - * @param string $cookieName |
|
| 60 | + * @param string $tokenCookieName |
|
| 61 | 61 | * @return null |
| 62 | 62 | */ |
| 63 | 63 | public function setTokenCookieName($tokenCookieName) |
@@ -137,7 +137,6 @@ discard block |
||
| 137 | 137 | * [Optional: 'Remember' => 1 ] |
| 138 | 138 | * ) |
| 139 | 139 | * |
| 140 | - * @param array $data |
|
| 141 | 140 | * @return HTTPResponse |
| 142 | 141 | */ |
| 143 | 142 | protected function redirectAfterSuccessfulLogin() |
@@ -219,6 +218,8 @@ discard block |
||
| 219 | 218 | * Try to authenticate the user |
| 220 | 219 | * |
| 221 | 220 | * @param array $data Submitted data |
| 221 | + * @param Member $member |
|
| 222 | + * @param \SilverStripe\Control\HTTPRequest $request |
|
| 222 | 223 | * @return Member Returns the member object on successful authentication |
| 223 | 224 | * or NULL on failure. |
| 224 | 225 | */ |
@@ -249,6 +250,7 @@ discard block |
||
| 249 | 250 | |
| 250 | 251 | /** |
| 251 | 252 | * @todo copypaste from FormRequestHandler - refactor |
| 253 | + * @param string $link |
|
| 252 | 254 | */ |
| 253 | 255 | protected function addBackURLParam($link) |
| 254 | 256 | { |