Completed
Push — authenticator-refactor ( 7dc887...371abb )
by Simon
06:49
created
src/Security/Member.php 2 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -889,9 +889,9 @@  discard block
 block discarded – undo
889 889
      * });
890 890
      * </code>
891 891
      *
892
-     * @param Member|null|int $member Member or member ID to log in as.
892
+     * @param null|Member $member Member or member ID to log in as.
893 893
      * Set to null or 0 to act as a logged out user.
894
-     * @param $callback
894
+     * @param \Closure $callback
895 895
      */
896 896
     public static function actAs($member, $callback)
897 897
     {
@@ -1661,7 +1661,7 @@  discard block
 block discarded – undo
1661 1661
      * This is likely to be customized for social sites etc. with a looser permission model.
1662 1662
      *
1663 1663
      * @param Member $member
1664
-     * @return bool
1664
+     * @return boolean|string
1665 1665
      */
1666 1666
     public function canView($member = null)
1667 1667
     {
@@ -1692,7 +1692,7 @@  discard block
 block discarded – undo
1692 1692
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1693 1693
      *
1694 1694
      * @param Member $member
1695
-     * @return bool
1695
+     * @return boolean|string
1696 1696
      */
1697 1697
     public function canEdit($member = null)
1698 1698
     {
@@ -1727,7 +1727,7 @@  discard block
 block discarded – undo
1727 1727
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1728 1728
      *
1729 1729
      * @param Member $member
1730
-     * @return bool
1730
+     * @return boolean|string
1731 1731
      */
1732 1732
     public function canDelete($member = null)
1733 1733
     {
Please login to merge, or discard this patch.
Unused Use Statements   -7 removed lines patch added patch discarded remove patch
@@ -5,16 +5,12 @@  discard block
 block discarded – undo
5 5
 use IntlDateFormatter;
6 6
 use SilverStripe\Admin\LeftAndMain;
7 7
 use SilverStripe\CMS\Controllers\CMSMain;
8
-use SilverStripe\Control\Cookie;
9 8
 use SilverStripe\Control\Director;
10 9
 use SilverStripe\Control\Email\Email;
11 10
 use SilverStripe\Control\Email\Mailer;
12
-use SilverStripe\Control\Session;
13 11
 use SilverStripe\Core\Convert;
14 12
 use SilverStripe\Core\Injector\Injector;
15
-use SilverStripe\Dev\Debug;
16 13
 use SilverStripe\Dev\Deprecation;
17
-use SilverStripe\Dev\SapphireTest;
18 14
 use SilverStripe\Dev\TestMailer;
19 15
 use SilverStripe\Forms\ConfirmedPasswordField;
20 16
 use SilverStripe\Forms\DropdownField;
@@ -33,9 +29,6 @@  discard block
 block discarded – undo
33 29
 use SilverStripe\ORM\Map;
34 30
 use SilverStripe\ORM\ValidationException;
35 31
 use SilverStripe\ORM\ValidationResult;
36
-use SilverStripe\View\SSViewer;
37
-use SilverStripe\View\TemplateGlobalProvider;
38
-use DateTime;
39 32
 
40 33
 /**
41 34
  * The member class which represents the users of the system
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: &nbsp; 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/BasicAuth.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,6 @@
 block discarded – undo
10 10
 use SilverStripe\Core\Config\Config;
11 11
 use SilverStripe\Core\Config\Configurable;
12 12
 use SilverStripe\Dev\SapphireTest;
13
-use SilverStripe\Core\Injector\Injector;
14
-
15 13
 use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;
16 14
 
17 15
 /**
Please login to merge, or discard this patch.
src/Security/CMSSecurity.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -8,9 +8,7 @@
 block discarded – undo
8 8
 use SilverStripe\Core\Convert;
9 9
 use SilverStripe\Control\Director;
10 10
 use SilverStripe\Control\Controller;
11
-use SilverStripe\Core\Injector\Injector;
12 11
 use SilverStripe\ORM\FieldType\DBField;
13
-use SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator;
14 12
 use SilverStripe\View\Requirements;
15 13
 
16 14
 /**
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/LostPasswordHandler.php 2 patches
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.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -5,11 +5,9 @@
 block discarded – undo
5 5
 use SilverStripe\Control\Controller;
6 6
 use SilverStripe\Control\Email\Email;
7 7
 use SilverStripe\Control\HTTPResponse;
8
-use SilverStripe\Control\Session;
9 8
 use SilverStripe\Control\RequestHandler;
10 9
 use SilverStripe\Core\Injector\Injector;
11 10
 use SilverStripe\Forms\Form;
12
-use SilverStripe\ORM\ValidationResult;
13 11
 use SilverStripe\Forms\FieldList;
14 12
 use SilverStripe\Forms\EmailField;
15 13
 use SilverStripe\Forms\FormAction;
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.
tests/php/Security/MemberTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,6 @@
 block discarded – undo
20 20
 use SilverStripe\Security\RememberLoginHash;
21 21
 use SilverStripe\Security\Member_Validator;
22 22
 use SilverStripe\Security\Tests\MemberTest\FieldsExtension;
23
-use SilverStripe\Control\HTTPRequest;
24 23
 
25 24
 class MemberTest extends FunctionalTest
26 25
 {
Please login to merge, or discard this patch.
tests/php/Security/SecurityTest.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace SilverStripe\Security\Tests;
4 4
 
5
-use SilverStripe\Dev\Debug;
6 5
 use SilverStripe\ORM\DataObject;
7 6
 use SilverStripe\ORM\FieldType\DBDatetime;
8 7
 use SilverStripe\ORM\FieldType\DBClassName;
@@ -15,7 +14,6 @@  discard block
 block discarded – undo
15 14
 use SilverStripe\Core\Config\Config;
16 15
 use SilverStripe\Core\Convert;
17 16
 use SilverStripe\Dev\FunctionalTest;
18
-use SilverStripe\Dev\TestOnly;
19 17
 use SilverStripe\Control\HTTPResponse;
20 18
 use SilverStripe\Control\Session;
21 19
 use SilverStripe\Control\Director;
Please login to merge, or discard this patch.