silverstripe / silverstripe-framework

src/Security/Group.php

Doc Comments +1 added lines

@@ -331,6 +331,7 @@
 	 * Overloaded to ensure the code is always descent.
 	 *
 	 * @param string
+	 * @param string $val
 	 */
 	public function setCode($val){
 		$this->setField("Code", Convert::raw2url($val));

src/Security/Member.php

Doc Comments +3 added lines, -3 removed lines

@@ -1563,7 +1563,7 @@ 
 	 * This is likely to be customized for social sites etc. with a looser permission model.
 	 *
 	 * @param Member $member
-	 * @return bool
+	 * @return boolean|string
 	 */
     public function canView($member = null) {
         //get member
@@ -1593,7 +1593,7 @@ 
 	 * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
 	 *
 	 * @param Member $member
-	 * @return bool
+	 * @return boolean|string
 	 */
     public function canEdit($member = null) {
         //get member
@@ -1627,7 +1627,7 @@ 
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
 	 *
 	 * @param Member $member
-	 * @return bool
+	 * @return boolean|string
      */
     public function canDelete($member = null) {
         if(!($member instanceof Member)) {

src/Security/MemberAuthenticator.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 	 * @param Form $form Optional: If passed, better error messages can be
 	 *                             produced by using
 	 *                             {@link Form::sessionMessage()}
-	 * @return bool|Member Returns FALSE if authentication fails, otherwise
+	 * @return Member|null Returns FALSE if authentication fails, otherwise
 	 *                     the member object
 	 * @see Security::setDefaultAdmin()
 	 */

src/Security/PasswordValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
 	 *
 	 * @param int $minScore The minimum number of character tests that must pass
-	 * @param array $testNames The names of the tests to perform
+	 * @param string[] $testNames The names of the tests to perform
 	 * @return $this
 	 */
 	public function characterStrength($minScore, $testNames) {

src/Security/Permission.php

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 	 *  will be checked for the current user
 	 * @param bool $strict Use "strict" checking (which means a permission
 	 *  will be granted if the key does not exist at all)?
-	 * @return int|bool The ID of the permission record if the permission
+	 * @return boolean|string The ID of the permission record if the permission
 	 *  exists; FALSE otherwise. If "strict" checking is
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
 	 */
@@ -159,7 +159,7 @@ 
 	 * @param string $arg Optional argument (e.g. a permissions for a specific page)
 	 * @param bool $strict Use "strict" checking (which means a permission
 	 *  will be granted if the key does not exist at all)?
-	 * @return int|bool The ID of the permission record if the permission
+	 * @return boolean|string The ID of the permission record if the permission
 	 *  exists; FALSE otherwise. If "strict" checking is
 	 *  disabled, TRUE will be returned if the permission does not exist at all.
 	 */

src/Security/Permission_Group.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	/**
 	 * Get permissions
 	 *
-	 * @return array Associative array of permissions in this permission
+	 * @return string Associative array of permissions in this permission
 	 *               group. The array indicies are the permission codes as
 	 *               used in {@link Permission::check()}. The value is
 	 *               suitable for using in an interface.

src/Security/RememberLoginHash.php

Doc Comments +3 added lines

@@ -76,6 +76,9 @@
 		return $this->token;
 	}
 
+	/**
+	 * @param string $token
+	 */
 	public function setToken($token) {
 		$this->token = $token;
 	}

src/Security/Security.php

Doc Comments +2 added lines, -2 removed lines

@@ -507,7 +507,7 @@ 
 	 * Combine the given forms into a formset with a tabbed interface
 	 *
 	 * @param array $forms List of LoginForm instances
-	 * @return string
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
 	 */
 	protected function generateLoginFormSet($forms) {
 		$viewData = new ArrayData(array(
@@ -1082,7 +1082,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) {
 		self::$ignore_disallowed_actions = $flag;

src/View/Parsers/Diff.php

Doc Comments +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
 	}
 
 	/**
-	 * @param string|array $content If passed as an array, values will be concatenated with a comma.
+	 * @param string $content If passed as an array, values will be concatenated with a comma.
 	 * @return array
 	 */
 	public static function getHTMLChunks($content) {