Completed
Push — authenticator-refactor ( 82d769...121803 )
by Sam
17:22
created
src/Security/BasicAuth.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 use SilverStripe\Core\Config\Configurable;
10 10
 use SilverStripe\Dev\SapphireTest;
11 11
 use SilverStripe\Core\Injector\Injector;
12
-
13 12
 use SilverStripe\Security\MemberAuthenticator\Authenticator;
14 13
 
15 14
 /**
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/Authenticator.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
      * Attempt to find and authenticate member if possible from the given data
52 52
      *
53 53
      * @param array $data
54
-     * @param Form $form
55 54
      * @param bool &$success Success flag
55
+     * @param string $message
56 56
      * @return Member Found member, regardless of successful login
57 57
      */
58 58
     protected function authenticateMember($data, &$message, &$success)
@@ -192,6 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
     /**
194 194
      * @inherit
195
+     * @param string $link
195 196
      */
196 197
     public function getLoginHandler($link)
197 198
     {
Please login to merge, or discard this patch.
src/Security/Security.php 1 patch
Doc Comments   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -561,8 +561,7 @@  discard block
 block discarded – undo
561 561
     /**
562 562
      * Combine the given forms into a formset with a tabbed interface
563 563
      *
564
-     * @param array $authenticators List of Authenticator instances
565
-     * @return string
564
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
566 565
      */
567 566
     protected function generateLoginFormSet($forms)
568 567
     {
@@ -628,6 +627,7 @@  discard block
 block discarded – undo
628 627
      * For multiple authenticators, Security_MultiAuthenticatorLogin is used.
629 628
      * See getTemplatesFor and getIncludeTemplate for how to override template logic
630 629
      *
630
+     * @param HTTPRequest $request
631 631
      * @return string|HTTPResponse Returns the "login" page as HTML code.
632 632
      */
633 633
     public function login($request)
@@ -658,6 +658,10 @@  discard block
 block discarded – undo
658 658
         $handlers = $authenticators;
659 659
         array_walk(
660 660
             $handlers,
661
+
662
+            /**
663
+             * @param HTTPRequest $auth
664
+             */
661 665
             function (&$auth, $name) use ($link) {
662 666
                 $auth = $auth->getLoginHandler(Controller::join_links($link, $name));
663 667
             }
@@ -745,7 +749,7 @@  discard block
 block discarded – undo
745 749
 
746 750
     /**
747 751
      * Render the given fragments into a security page controller with the given title.
748
-     * @param $title string The title to give the security page
752
+     * @param string $title string The title to give the security page
749 753
      * @param $fragments A map of objects to render into the page, e.g. "Form"
750 754
      * @param $templates An array of templates to use for the render
751 755
      */
@@ -912,7 +916,7 @@  discard block
 block discarded – undo
912 916
      * Factory method for the lost password form
913 917
      *
914 918
      * @skipUpgrade
915
-     * @return ChangePasswordForm Returns the lost password form
919
+     * @return MemberAuthenticator\ChangePasswordForm Returns the lost password form
916 920
      */
917 921
     public function ChangePasswordForm()
918 922
     {
@@ -1197,6 +1201,7 @@  discard block
 block discarded – undo
1197 1201
 
1198 1202
     /**
1199 1203
      * For the database_is_ready call to return a certain value - used for testing
1204
+     * @param boolean $isReady
1200 1205
      */
1201 1206
     public static function force_database_is_ready($isReady)
1202 1207
     {
@@ -1240,7 +1245,7 @@  discard block
 block discarded – undo
1240 1245
     /**
1241 1246
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1242 1247
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1243
-     * @param $flag True or false
1248
+     * @param boolean $flag True or false
1244 1249
      */
1245 1250
     public static function set_ignore_disallowed_actions($flag)
1246 1251
     {
Please login to merge, or discard this patch.
tests/php/Security/MemberAuthenticatorTest.php 1 patch
Unused Use Statements   -5 removed lines patch added patch discarded remove patch
@@ -2,11 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace SilverStripe\Security\Tests;
4 4
 
5
-use SilverStripe\ORM\DataObject;
6 5
 use SilverStripe\ORM\FieldType\DBDatetime;
7
-use SilverStripe\ORM\ValidationResult;
8
-use SilverStripe\Security\PasswordEncryptor;
9
-use SilverStripe\Security\PasswordEncryptor_PHPHash;
10 6
 use SilverStripe\Security\Security;
11 7
 use SilverStripe\Security\Member;
12 8
 use SilverStripe\Security\MemberAuthenticator\Authenticator;
@@ -14,7 +10,6 @@  discard block
 block discarded – undo
14 10
 use SilverStripe\Security\CMSMemberLoginForm;
15 11
 use SilverStripe\Core\Config\Config;
16 12
 use SilverStripe\Dev\SapphireTest;
17
-use SilverStripe\Forms\FieldList;
18 13
 use SilverStripe\Forms\Form;
19 14
 use SilverStripe\Control\HTTPRequest;
20 15
 
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
@@ -11,7 +11,6 @@
 block discarded – undo
11 11
 use SilverStripe\ORM\DB;
12 12
 use SilverStripe\ORM\FieldType\DBDatetime;
13 13
 use SilverStripe\Security\Member;
14
-use SilverStripe\Security\MemberAuthenticator;
15 14
 use SilverStripe\Security\Security;
16 15
 use SilverStripe\Security\MemberPassword;
17 16
 use SilverStripe\Security\Group;
Please login to merge, or discard this patch.