Completed
Pull Request — master (#6829)
by Simon
08:53
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/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/Core/Injector/Injector.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
      *
372 372
      * @param string $property
373 373
      *                the name of the property
374
-     * @param object $object
374
+     * @param string $object
375 375
      *                the object to be set
376 376
      * @return $this
377 377
      */
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
      *              The name of the service to update the definition for
467 467
      * @param string $property
468 468
      *              The name of the property to update.
469
-     * @param mixed $value
469
+     * @param string $value
470 470
      *              The value to set
471 471
      * @param boolean $append
472 472
      *              Whether to append (the default) when the property is an array
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
     /**
789 789
      * @deprecated 4.0.0:5.0.0 Use Injector::has() instead
790 790
      * @param $name
791
-     * @return string
791
+     * @return boolean
792 792
      */
793 793
     public function hasService($name)
794 794
     {
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.
src/ORM/DataObjectSchema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -488,7 +488,7 @@
 block discarded – undo
488 488
      * Cache all indexes for the given class.
489 489
      * Will do nothing if already cached
490 490
      *
491
-     * @param $class
491
+     * @param string $class
492 492
      */
493 493
     protected function cacheDatabaseIndexes($class)
494 494
     {
Please login to merge, or discard this patch.