Completed
Pull Request — master (#6829)
by Simon
19:33
created
tests/php/Forms/EmailFieldTest.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -40,6 +40,11 @@
 block discarded – undo
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");
Please login to merge, or discard this patch.
tests/php/View/ContentNegotiatorTest.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -14,6 +14,7 @@
 block discarded – undo
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
     {
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   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -573,8 +573,7 @@  discard block
 block discarded – undo
573 573
     /**
574 574
      * Combine the given forms into a formset with a tabbed interface
575 575
      *
576
-     * @param array $authenticators List of Authenticator instances
577
-     * @return string
576
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
578 577
      */
579 578
     protected function generateLoginFormSet($forms)
580 579
     {
@@ -640,7 +639,7 @@  discard block
 block discarded – undo
640 639
      * For multiple authenticators, Security_MultiAuthenticatorLogin is used.
641 640
      * See getTemplatesFor and getIncludeTemplate for how to override template logic
642 641
      *
643
-     * @param $request
642
+     * @param HTTPRequest $request
644 643
      * @return HTTPResponse|string Returns the "login" page as HTML code.
645 644
      * @throws HTTPResponse_Exception
646 645
      */
@@ -672,6 +671,10 @@  discard block
 block discarded – undo
672 671
         $handlers = $authenticators;
673 672
         array_walk(
674 673
             $handlers,
674
+
675
+            /**
676
+             * @param HTTPRequest $auth
677
+             */
675 678
             function (&$auth, $name) use ($link) {
676 679
                 $auth = $auth->getLoginHandler(Controller::join_links($link, $name));
677 680
             }
@@ -927,7 +930,7 @@  discard block
 block discarded – undo
927 930
      * Factory method for the lost password form
928 931
      *
929 932
      * @skipUpgrade
930
-     * @return ChangePasswordForm Returns the lost password form
933
+     * @return MemberAuthenticator\ChangePasswordForm Returns the lost password form
931 934
      */
932 935
     public function ChangePasswordForm()
933 936
     {
@@ -1212,6 +1215,7 @@  discard block
 block discarded – undo
1212 1215
 
1213 1216
     /**
1214 1217
      * For the database_is_ready call to return a certain value - used for testing
1218
+     * @param boolean $isReady
1215 1219
      */
1216 1220
     public static function force_database_is_ready($isReady)
1217 1221
     {
@@ -1255,7 +1259,7 @@  discard block
 block discarded – undo
1255 1259
     /**
1256 1260
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1257 1261
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1258
-     * @param $flag True or false
1262
+     * @param boolean $flag True or false
1259 1263
      */
1260 1264
     public static function set_ignore_disallowed_actions($flag)
1261 1265
     {
Please login to merge, or discard this patch.