silverstripe / silverstripe-framework

src/Forms/TreeDropdownField.php

Doc Comments +2 added lines, -2 removed lines

@@ -313,7 +313,7 @@ 
 
     /**
      * @param array $properties
-     * @return string
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
      */
     public function Field($properties = array())
     {
@@ -479,7 +479,7 @@ 
 
     /**
      * Marking a specific node in the tree as disabled
-     * @param $node
+     * @param DataObject $node
      * @return boolean
      */
     public function nodeIsDisabled($node)

src/ORM/Hierarchy/MarkedSet.php

Doc Comments +3 added lines, -3 removed lines

@@ -380,7 +380,7 @@ 
      *
      * @param DataObject $node
      * @param int $depth
-     * @return array|string
+     * @return callable
      */
     protected function getSubtree($node, $depth = 0)
     {
@@ -613,7 +613,7 @@ 
     /**
      * Expose the given object in the tree, by marking this page and all it ancestors.
      *
-     * @param DataObject|Hierarchy $childObj
+     * @param DataObject $childObj
      * @return $this
      */
     public function markToExpose(DataObject $childObj)
@@ -758,7 +758,7 @@ 
     /**
      * Check if this node has too many children
      *
-     * @param DataObject|Hierarchy $node
+     * @param DataObject $node
      * @param int $count Children count (if already calculated)
      * @return bool
      */

tests/php/ORM/MarkedSetTest.php

Doc Comments +5 added lines

@@ -418,6 +418,7 @@ 
      *
      * @param string$html
      * @param DataObject $node
+     * @param string $html
      * @return string
      */
     protected function getNodeClassFromTree($html, $node)
@@ -434,6 +435,10 @@ 
         return '';
     }
 
+    /**
+     * @param string $expected
+     * @param string $actual
+     */
     protected function assertHTMLSame($expected, $actual, $message = '')
     {
         // Trim each line, strip empty lines

src/Security/MemberAuthenticator/Authenticator.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,8 +50,8 @@
      * Attempt to find and authenticate member if possible from the given data
      *
      * @param array $data
-     * @param Form $form
      * @param bool &$success Success flag
+     * @param string $message
      * @return Member Found member, regardless of successful login
      */
     protected function authenticateMember($data, &$message, &$success)

src/Security/MemberAuthenticator/LoginHandler.php

Doc Comments +1 added lines

@@ -130,6 +130,7 @@
      * )
      *
      * @param array $data
+     * @param LoginHandler $formHandler
      * @return HTTPResponse
      */
     protected function logInUserAndRedirect($data, $formHandler)

src/Security/MemberAuthenticator/LostPasswordHandler.php

Doc Comments +4 added lines, -1 removed lines

@@ -55,6 +55,7 @@ 
     /**
      * Return a link to this request handler.
      * The link returned is supplied in the constructor
+     * @param string $action
      * @return string
      */
     public function link($action = null)
@@ -115,7 +116,7 @@ 
      * Factory method for the lost password form
      *
      * @skipUpgrade
-     * @return Form Returns the lost password form
+     * @return LoginForm Returns the lost password form
      */
     public function lostPasswordForm()
     {
@@ -247,6 +248,8 @@ 
 
     /**
      * @todo copypaste from FormRequestHandler - refactor
+     * @param string $link
+     * @return string
      */
     protected function addBackURLParam($link)
     {

src/Security/Security.php

Doc Comments +3 added lines, -4 removed lines

@@ -565,8 +565,7 @@ 
     /**
      * Combine the given forms into a formset with a tabbed interface
      *
-     * @param array $authenticators List of Authenticator instances
-     * @return string
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
      */
     protected function generateLoginFormSet($forms)
     {
@@ -924,7 +923,7 @@ 
      * Factory method for the lost password form
      *
      * @skipUpgrade
-     * @return ChangePasswordForm Returns the lost password form
+     * @return MemberAuthenticator\ChangePasswordForm Returns the lost password form
      */
     public function ChangePasswordForm()
     {
@@ -1235,7 +1234,7 @@ 
     /**
      * Set to true to ignore access to disallowed actions, rather than returning permission failure
      * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
-     * @param $flag True or false
+     * @param boolean $flag True or false
      */
     public static function set_ignore_disallowed_actions($flag)
     {