Completed
Pull Request — master (#6829)
by Damian
08:47
created
src/Security/CMSSecurity.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -49,6 +49,9 @@  discard block
 block discarded – undo
49 49
         return parent::login($request, Authenticator::CMS_LOGIN);
50 50
     }
51 51
 
52
+    /**
53
+     * @param string $action
54
+     */
52 55
     public function Link($action = null)
53 56
     {
54 57
         /** @skipUpgrade */
@@ -79,6 +82,9 @@  discard block
 block discarded – undo
79 82
         return null;
80 83
     }
81 84
 
85
+    /**
86
+     * @param string $title
87
+     */
82 88
     public function getResponseController($title)
83 89
     {
84 90
         // Use $this to prevent use of Page to render underlying templates
Please login to merge, or discard this patch.
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/ChangePasswordHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@
 block discarded – undo
169 169
     /**
170 170
      * Return a link to this request handler.
171 171
      * The link returned is supplied in the constructor
172
-     * @param null $action
172
+     * @param string $action
173 173
      * @return string
174 174
      */
175 175
     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 = null, $member = null)
Please login to merge, or discard this patch.
src/Security/Member.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
      * });
750 750
      * </code>
751 751
      *
752
-     * @param Member|null|int $member Member or member ID to log in as.
752
+     * @param null|Member $member Member or member ID to log in as.
753 753
      * Set to null or 0 to act as a logged out user.
754 754
      * @param callable $callback
755 755
      */
@@ -1521,7 +1521,7 @@  discard block
 block discarded – undo
1521 1521
      * This is likely to be customized for social sites etc. with a looser permission model.
1522 1522
      *
1523 1523
      * @param Member $member
1524
-     * @return bool
1524
+     * @return boolean|string
1525 1525
      */
1526 1526
     public function canView($member = null)
1527 1527
     {
@@ -1553,7 +1553,7 @@  discard block
 block discarded – undo
1553 1553
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1554 1554
      *
1555 1555
      * @param Member $member
1556
-     * @return bool
1556
+     * @return boolean|string
1557 1557
      */
1558 1558
     public function canEdit($member = null)
1559 1559
     {
@@ -1590,7 +1590,7 @@  discard block
 block discarded – undo
1590 1590
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1591 1591
      *
1592 1592
      * @param Member $member
1593
-     * @return bool
1593
+     * @return boolean|string
1594 1594
      */
1595 1595
     public function canDelete($member = null)
1596 1596
     {
Please login to merge, or discard this patch.
src/Security/Security.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -616,7 +616,7 @@
 block discarded – undo
616 616
      * Combine the given forms into a formset with a tabbed interface
617 617
      *
618 618
      * @param array|Form[] $forms
619
-     * @return string
619
+     * @return DBHTMLText
620 620
      */
621 621
     protected function generateLoginFormSet($forms)
622 622
     {
Please login to merge, or discard this patch.