Completed
Pull Request — master (#6829)
by Simon
09:40
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/BasicAuth.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
      * @param string|array $permissionCode Optional
60 60
      * @param boolean $tryUsingSessionLogin If true, then the method with authenticate against the
61 61
      *  session log-in if those credentials are disabled.
62
-     * @return bool|Member
62
+     * @return null|Member
63 63
      * @throws HTTPResponse_Exception
64 64
      */
65 65
     public static function requireLogin(
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/Security.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
     protected static $currentUser;
228 228
 
229 229
     /**
230
-     * @return array
230
+     * @return Authenticator[]
231 231
      */
232 232
     public static function getAuthenticators()
233 233
     {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
      * Get all registered authenticators
293 293
      *
294 294
      * @param int $service The type of service that is requested
295
-     * @return array Return an array of Authenticator objects
295
+     * @return Authenticator[] Return an array of Authenticator objects
296 296
      */
297 297
     public function getApplicableAuthenticators($service = Authenticator::LOGIN)
298 298
     {
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
      * Combine the given forms into a formset with a tabbed interface
627 627
      *
628 628
      * @param array|Form[] $forms
629
-     * @return string
629
+     * @return DBHTMLText
630 630
      */
631 631
     protected function generateLoginFormSet($forms)
632 632
     {
@@ -1203,6 +1203,7 @@  discard block
 block discarded – undo
1203 1203
 
1204 1204
     /**
1205 1205
      * For the database_is_ready call to return a certain value - used for testing
1206
+     * @param boolean $isReady
1206 1207
      */
1207 1208
     public static function force_database_is_ready($isReady)
1208 1209
     {
@@ -1223,7 +1224,7 @@  discard block
 block discarded – undo
1223 1224
     /**
1224 1225
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1225 1226
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1226
-     * @param $flag True or false
1227
+     * @param boolean $flag True or false
1227 1228
      */
1228 1229
     public static function set_ignore_disallowed_actions($flag)
1229 1230
     {
Please login to merge, or discard this patch.