Completed
Pull Request — master (#6829)
by Simon
08:53
created
src/Security/MemberAuthenticator/LostPasswordHandler.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,6 +55,7 @@  discard block
 block discarded – undo
55 55
     /**
56 56
      * Return a link to this request handler.
57 57
      * The link returned is supplied in the constructor
58
+     * @param string $action
58 59
      * @return string
59 60
      */
60 61
     public function link($action = null)
@@ -115,7 +116,7 @@  discard block
 block discarded – undo
115 116
      * Factory method for the lost password form
116 117
      *
117 118
      * @skipUpgrade
118
-     * @return Form Returns the lost password form
119
+     * @return LoginForm Returns the lost password form
119 120
      */
120 121
     public function lostPasswordForm()
121 122
     {
@@ -247,6 +248,8 @@  discard block
 block discarded – undo
247 248
 
248 249
     /**
249 250
      * @todo copypaste from FormRequestHandler - refactor
251
+     * @param string $link
252
+     * @return string
250 253
      */
251 254
     protected function addBackURLParam($link)
252 255
     {
Please login to merge, or discard this patch.
src/Security/MemberAuthenticator/Authenticator.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -53,6 +53,7 @@
 block discarded – undo
53 53
      * @param $message
54 54
      * @param bool &$success Success flag
55 55
      * @param null|Member $member If the parent method already identified the member, it can be passed in
56
+     * @param null|boolean $success
56 57
      * @return Member Found member, regardless of successful login
57 58
      */
58 59
     protected function authenticateMember($data, &$message, &$success, $member = null)
Please login to merge, or discard this patch.
src/ORM/DataObject.php 1 patch
Doc Comments   +9 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2165,7 +2165,7 @@  discard block
 block discarded – undo
2165 2165
      * Called by {@link __get()} and any getFieldName() methods you might create.
2166 2166
      *
2167 2167
      * @param string $field The name of the field
2168
-     * @return mixed The field value
2168
+     * @return string|null The field value
2169 2169
      */
2170 2170
     public function getField($field)
2171 2171
     {
@@ -2447,6 +2447,7 @@  discard block
 block discarded – undo
2447 2447
 
2448 2448
     /**
2449 2449
      * {@inheritdoc}
2450
+     * @param string $field
2450 2451
      */
2451 2452
     public function castingHelper($field)
2452 2453
     {
@@ -2552,7 +2553,7 @@  discard block
 block discarded – undo
2552 2553
      * </code>
2553 2554
      *
2554 2555
      * @param string $methodName Method on the same object, e.g. {@link canEdit()}
2555
-     * @param Member|int $member
2556
+     * @param Member|null $member
2556 2557
      * @param array $context Optional context
2557 2558
      * @return boolean|null
2558 2559
      */
@@ -2575,7 +2576,7 @@  discard block
 block discarded – undo
2575 2576
 
2576 2577
     /**
2577 2578
      * @param Member $member
2578
-     * @return boolean
2579
+     * @return boolean|string
2579 2580
      */
2580 2581
     public function canView($member = null)
2581 2582
     {
@@ -2588,7 +2589,7 @@  discard block
 block discarded – undo
2588 2589
 
2589 2590
     /**
2590 2591
      * @param Member $member
2591
-     * @return boolean
2592
+     * @return boolean|string
2592 2593
      */
2593 2594
     public function canEdit($member = null)
2594 2595
     {
@@ -2601,7 +2602,7 @@  discard block
 block discarded – undo
2601 2602
 
2602 2603
     /**
2603 2604
      * @param Member $member
2604
-     * @return boolean
2605
+     * @return boolean|string
2605 2606
      */
2606 2607
     public function canDelete($member = null)
2607 2608
     {
@@ -2616,7 +2617,7 @@  discard block
 block discarded – undo
2616 2617
      * @param Member $member
2617 2618
      * @param array $context Additional context-specific data which might
2618 2619
      * affect whether (or where) this object could be created.
2619
-     * @return boolean
2620
+     * @return boolean|string
2620 2621
      */
2621 2622
     public function canCreate($member = null, $context = array())
2622 2623
     {
@@ -2731,7 +2732,7 @@  discard block
 block discarded – undo
2731 2732
      * Traverses to a field referenced by relationships between data objects, returning the value
2732 2733
      * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
2733 2734
      *
2734
-     * @param $fieldName string
2735
+     * @param string $fieldName string
2735 2736
      * @return string | null - will return null on a missing value
2736 2737
      */
2737 2738
     public function relField($fieldName)
@@ -2809,7 +2810,7 @@  discard block
 block discarded – undo
2809 2810
      * @param string $callerClass The class of objects to be returned
2810 2811
      * @param string|array $filter A filter to be inserted into the WHERE clause.
2811 2812
      * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
2812
-     * @param string|array $sort A sort expression to be inserted into the ORDER
2813
+     * @param string $sort A sort expression to be inserted into the ORDER
2813 2814
      * BY clause.  If omitted, self::$default_sort will be used.
2814 2815
      * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
2815 2816
      * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
Please login to merge, or discard this patch.
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/Security/Member.php 1 patch
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -422,7 +422,6 @@  discard block
 block discarded – undo
422 422
     /**
423 423
      * @deprecated Use Security::setCurrentUser() or IdentityStore::logIn()
424 424
      *
425
-     * @param bool $remember If set to TRUE, the member will be logged in automatically the next time.
426 425
      */
427 426
     public function logIn()
428 427
     {
@@ -737,9 +736,9 @@  discard block
 block discarded – undo
737 736
      * });
738 737
      * </code>
739 738
      *
740
-     * @param Member|null|int $member Member or member ID to log in as.
739
+     * @param null|Member $member Member or member ID to log in as.
741 740
      * Set to null or 0 to act as a logged out user.
742
-     * @param $callback
741
+     * @param \Closure $callback
743 742
      */
744 743
     public static function actAs($member, $callback)
745 744
     {
@@ -1489,7 +1488,7 @@  discard block
 block discarded – undo
1489 1488
      * This is likely to be customized for social sites etc. with a looser permission model.
1490 1489
      *
1491 1490
      * @param Member $member
1492
-     * @return bool
1491
+     * @return boolean|string
1493 1492
      */
1494 1493
     public function canView($member = null)
1495 1494
     {
@@ -1520,7 +1519,7 @@  discard block
 block discarded – undo
1520 1519
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1521 1520
      *
1522 1521
      * @param Member $member
1523
-     * @return bool
1522
+     * @return boolean|string
1524 1523
      */
1525 1524
     public function canEdit($member = null)
1526 1525
     {
@@ -1555,7 +1554,7 @@  discard block
 block discarded – undo
1555 1554
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1556 1555
      *
1557 1556
      * @param Member $member
1558
-     * @return bool
1557
+     * @return boolean|string
1559 1558
      */
1560 1559
     public function canDelete($member = null)
1561 1560
     {
Please login to merge, or discard this patch.
src/Security/Security.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
      * Combine the given forms into a formset with a tabbed interface
602 602
      *
603 603
      * @param $forms
604
-     * @return string
604
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
605 605
      */
606 606
     protected function generateLoginFormSet($forms)
607 607
     {
@@ -1241,6 +1241,7 @@  discard block
 block discarded – undo
1241 1241
 
1242 1242
     /**
1243 1243
      * For the database_is_ready call to return a certain value - used for testing
1244
+     * @param boolean $isReady
1244 1245
      */
1245 1246
     public static function force_database_is_ready($isReady)
1246 1247
     {
@@ -1284,7 +1285,7 @@  discard block
 block discarded – undo
1284 1285
     /**
1285 1286
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
1286 1287
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1287
-     * @param $flag True or false
1288
+     * @param boolean $flag True or false
1288 1289
      */
1289 1290
     public static function set_ignore_disallowed_actions($flag)
1290 1291
     {
Please login to merge, or discard this patch.
src/Security/IdentityStore.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
      * @param Member $member The member to log in.
19 19
      * @param Boolean $persistent boolean If set to true, the login may persist beyond the current session.
20 20
      * @param HTTPRequest $request The request of the visitor that is logging in, to get, for example, cookies.
21
-     * @param HTTPResponse $response The response object to modify, if needed.
21
+     * @return void
22 22
      */
23 23
     public function logIn(Member $member, $persistent, HTTPRequest $request);
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
      * Log any logged-in member out of this identity store.
27 27
      *
28 28
      * @param HTTPRequest $request The request of the visitor that is logging out, to get, for example, cookies.
29
-     * @param HTTPResponse $response The response object to modify, if needed.
29
+     * @return void
30 30
      */
31 31
     public function logOut(HTTPRequest $request);
32 32
 }
Please login to merge, or discard this patch.