Completed
Push — authenticator-refactor ( f35b0f )
by Sam
07:39
created
src/Forms/HTMLEditor/HTMLEditorField_Embed.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
     }
144 144
 
145 145
     /**
146
-     * @return AdapterInterface
146
+     * @return Adapter
147 147
      */
148 148
     public function getEmbed()
149 149
     {
Please login to merge, or discard this patch.
src/Forms/TreeDropdownField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
     /**
315 315
      * @param array $properties
316
-     * @return string
316
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
317 317
      */
318 318
     public function Field($properties = array())
319 319
     {
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
     /**
481 481
      * Marking a specific node in the tree as disabled
482
-     * @param $node
482
+     * @param DataObject $node
483 483
      * @return boolean
484 484
      */
485 485
     public function nodeIsDisabled($node)
Please login to merge, or discard this patch.
src/ORM/Hierarchy/MarkedSet.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
      *
388 388
      * @param DataObject $node
389 389
      * @param int $depth
390
-     * @return array|string
390
+     * @return callable
391 391
      */
392 392
     protected function getSubtree($node, $depth = 0)
393 393
     {
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
     /**
621 621
      * Expose the given object in the tree, by marking this page and all it ancestors.
622 622
      *
623
-     * @param DataObject|Hierarchy $childObj
623
+     * @param DataObject $childObj
624 624
      * @return $this
625 625
      */
626 626
     public function markToExpose(DataObject $childObj)
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
     /**
766 766
      * Check if this node has too many children
767 767
      *
768
-     * @param DataObject|Hierarchy $node
768
+     * @param DataObject $node
769 769
      * @param int $count Children count (if already calculated)
770 770
      * @return bool
771 771
      */
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/Authenticator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@
 block discarded – undo
47 47
      * Attempt to find and authenticate member if possible from the given data
48 48
      *
49 49
      * @param array $data
50
-     * @param Form $form
51 50
      * @param bool &$success Success flag
51
+     * @param string $message
52 52
      * @return Member Found member, regardless of successful login
53 53
      */
54 54
     protected function authenticateMember($data, &$message, &$success)
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/LoginForm.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@
 block discarded – undo
15 15
 use SilverStripe\Forms\RequiredFields;
16 16
 use SilverStripe\ORM\ValidationResult;
17 17
 use SilverStripe\View\Requirements;
18
-
19 18
 use SilverStripe\Security\Member;
20 19
 use SilverStripe\Security\Security;
21 20
 use SilverStripe\Security\RememberLoginHash;
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/LostPasswordHandler.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
      * Factory method for the lost password form
103 103
      *
104 104
      * @skipUpgrade
105
-     * @return Form Returns the lost password form
105
+     * @return LoginForm Returns the lost password form
106 106
      */
107 107
     public function lostPasswordForm()
108 108
     {
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -5,9 +5,7 @@
 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
-use SilverStripe\ORM\ValidationResult;
11 9
 
12 10
 /**
13 11
  * Handle login requests from MemberLoginForm
Please login to merge, or discard this patch.
src/Security/Security.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
      * Combine the given forms into a formset with a tabbed interface
584 584
      *
585 585
      * @param array $forms List of LoginForm instances
586
-     * @return string
586
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
587 587
      */
588 588
     protected function generateLoginFormSet($forms)
589 589
     {
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
893 893
      * Factory method for the lost password form
894 894
      *
895 895
      * @skipUpgrade
896
-     * @return ChangePasswordForm Returns the lost password form
896
+     * @return MemberAuthenticator\ChangePasswordForm Returns the lost password form
897 897
      */
898 898
     public function ChangePasswordForm()
899 899
     {
@@ -1204,7 +1204,7 @@  discard block
 block discarded – undo
1204 1204
     /**
1205 1205
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1206 1206
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1207
-     * @param $flag True or false
1207
+     * @param boolean $flag True or false
1208 1208
      */
1209 1209
     public static function set_ignore_disallowed_actions($flag)
1210 1210
     {
Please login to merge, or discard this patch.
Unused Use Statements   -5 removed lines patch added patch discarded remove patch
@@ -12,14 +12,10 @@  discard block
 block discarded – undo
12 12
 use SilverStripe\Control\Session;
13 13
 use SilverStripe\Control\RequestHandler;
14 14
 use SilverStripe\Core\ClassInfo;
15
-use SilverStripe\Core\Config\Config;
16 15
 use SilverStripe\Core\Convert;
17 16
 use SilverStripe\Dev\Deprecation;
18 17
 use SilverStripe\Dev\TestOnly;
19
-use SilverStripe\Forms\EmailField;
20
-use SilverStripe\Forms\FieldList;
21 18
 use SilverStripe\Forms\Form;
22
-use SilverStripe\Forms\FormAction;
23 19
 use SilverStripe\ORM\ArrayList;
24 20
 use SilverStripe\ORM\DB;
25 21
 use SilverStripe\ORM\DataObject;
@@ -29,7 +25,6 @@  discard block
 block discarded – undo
29 25
 use SilverStripe\View\SSViewer;
30 26
 use SilverStripe\View\TemplateGlobalProvider;
31 27
 use Exception;
32
-use SilverStripe\View\ViewableData_Customised;
33 28
 use Subsite;
34 29
 use SilverStripe\Core\Injector\Injector;
35 30
 
Please login to merge, or discard this patch.
tests/php/ORM/DBDateTest.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -7,9 +7,7 @@
 block discarded – undo
7 7
 use SilverStripe\ORM\FieldType\DBDate;
8 8
 use SilverStripe\ORM\FieldType\DBField;
9 9
 use SilverStripe\ORM\FieldType\DBDatetime;
10
-use SilverStripe\ORM\DataObject;
11 10
 use SilverStripe\Dev\SapphireTest;
12
-use SilverStripe\Security\Member;
13 11
 
14 12
 class DBDateTest extends SapphireTest
15 13
 {
Please login to merge, or discard this patch.
tests/php/ORM/MarkedSetTest.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -418,6 +418,7 @@  discard block
 block discarded – undo
418 418
      *
419 419
      * @param string$html
420 420
      * @param DataObject $node
421
+     * @param string $html
421 422
      * @return string
422 423
      */
423 424
     protected function getNodeClassFromTree($html, $node)
@@ -434,6 +435,10 @@  discard block
 block discarded – undo
434 435
         return '';
435 436
     }
436 437
 
438
+    /**
439
+     * @param string $expected
440
+     * @param string $actual
441
+     */
437 442
     protected function assertHTMLSame($expected, $actual, $message = '')
438 443
     {
439 444
         // Trim each line, strip empty lines
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace SilverStripe\ORM\Tests;
4 4
 
5
-use DOMDocument;
6 5
 use SilverStripe\Dev\CSSContentParser;
7 6
 use SilverStripe\Dev\SapphireTest;
8 7
 use SilverStripe\ORM\DataObject;
Please login to merge, or discard this patch.