Completed
Pull Request — master (#6847)
by Daniel
09:45
created
src/Forms/DefaultFormFactory.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
     /**
105 105
      * Return list of mandatory context keys
106 106
      *
107
-     * @return mixed
107
+     * @return string[]
108 108
      */
109 109
     public function getRequiredContext()
110 110
     {
Please login to merge, or discard this patch.
src/Security/Member.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
     /**
800 800
      * Builds "Change / Create Password" field for this member
801 801
      *
802
-     * @return ConfirmedPasswordField
802
+     * @return \SilverStripe\Forms\FormField
803 803
      */
804 804
     public function getMemberPasswordField()
805 805
     {
@@ -879,9 +879,9 @@  discard block
 block discarded – undo
879 879
      * });
880 880
      * </code>
881 881
      *
882
-     * @param Member|null|int $member Member or member ID to log in as.
882
+     * @param Member|null $member Member or member ID to log in as.
883 883
      * Set to null or 0 to act as a logged out user.
884
-     * @param $callback
884
+     * @param \Closure $callback
885 885
      */
886 886
     public static function actAs($member, $callback)
887 887
     {
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
1633 1633
      * This is likely to be customized for social sites etc. with a looser permission model.
1634 1634
      *
1635 1635
      * @param Member $member
1636
-     * @return bool
1636
+     * @return boolean|string
1637 1637
      */
1638 1638
     public function canView($member = null)
1639 1639
     {
@@ -1664,7 +1664,7 @@  discard block
 block discarded – undo
1664 1664
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1665 1665
      *
1666 1666
      * @param Member $member
1667
-     * @return bool
1667
+     * @return boolean|string
1668 1668
      */
1669 1669
     public function canEdit($member = null)
1670 1670
     {
@@ -1699,7 +1699,7 @@  discard block
 block discarded – undo
1699 1699
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
1700 1700
      *
1701 1701
      * @param Member $member
1702
-     * @return bool
1702
+     * @return boolean|string
1703 1703
      */
1704 1704
     public function canDelete($member = null)
1705 1705
     {
Please login to merge, or discard this patch.
tests/php/View/Parsers/ShortcodeParserTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -208,6 +208,9 @@
 block discarded – undo
208 208
         $this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]'));
209 209
     }
210 210
 
211
+    /**
212
+     * @param string $a
213
+     */
211 214
     protected function assertEqualsIgnoringWhitespace($a, $b, $message = null)
212 215
     {
213 216
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
Please login to merge, or discard this patch.