Completed
Pull Request — master (#6829)
by Simon
08:48
created
src/Dev/FunctionalTest.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
      */
@@ -424,6 +424,9 @@  discard block
 block discarded – undo
424 424
         Security::setCurrentUser(null);
425 425
     }
426 426
 
427
+    /**
428
+     * @param DataObject|null $member
429
+     */
427 430
     public function logIn($member)
428 431
     {
429 432
         Security::setCurrentUser($member);
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/LostPasswordHandler.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -58,6 +58,7 @@
 block discarded – undo
58 58
     /**
59 59
      * Return a link to this request handler.
60 60
      * The link returned is supplied in the constructor
61
+     * @param string $action
61 62
      * @return string
62 63
      */
63 64
     public function link($action = null)
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/MemberAuthenticator.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -53,6 +53,7 @@
 block discarded – undo
53 53
      * @param array $data Form submitted data
54 54
      * @param ValidationResult $result
55 55
      * @param Member|null This third parameter is used in the CMSAuthenticator(s)
56
+     * @param Member $member
56 57
      * @return Member Found member, regardless of successful login
57 58
      */
58 59
     protected function authenticateMember($data, &$result, $member = null)
Please login to merge, or discard this patch.