silverstripe / silverstripe-framework

parsers/BBCodeParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 	 * Main BBCode parser method. This takes plain jane content and
 	 * runs it through so many filters
 	 *
-	 * @return Text
+	 * @return string
 	 */
 	public function parse() {
 		$this->content = str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $this->content);

parsers/HTML/HTMLBBCodeParser.php

Doc Comments +7 added lines, -2 removed lines

@@ -177,6 +177,10 @@ 
 		$this->addFilters($this->_options['filters']);
 	}
 
+	/**
+	 * @param string $class
+	 * @param string $var
+	 */
 	static function &getStaticProperty($class, $var)
 	{
 		static $properties;
@@ -406,6 +410,7 @@ 
 	 * array as an associative array.
 	 *
 	 * @param    string          string to build tag from
+	 * @param string $str
 	 * @return   array           tag in array format
 	 * @access   private
 	 * @see      _buildTagArray()
@@ -840,7 +845,7 @@ 
 	/**
 	 * Quick method to do setText(), parse() and getParsed at once
 	 *
-	 * @return   none
+	 * @return   string
 	 * @access   public
 	 * @see      parse()
 	 * @see      $_text
@@ -856,7 +861,7 @@ 
 	/**
 	 * Quick static method to do setText(), parse() and getParsed at once
 	 *
-	 * @return   none
+	 * @return   string
 	 * @access   public
 	 * @see      parse()
 	 * @see      $_text

security/Authenticator.php

Doc Comments +3 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	/**
 	 * Method that creates the login form for this authentication method
 	 *
-	 * @param Controller The parent controller, necessary to create the
+	 * @param Controller Controller parent controller, necessary to create the
 	 *                   appropriate form action tag
 	 * @return Form Returns the login form to use with this authentication
 	 *              method
@@ -121,7 +121,7 @@ 
 	 * Remove a previously registered authenticator
 	 *
 	 * @param string $authenticator Name of the authenticator class to register
-	 * @return bool Returns TRUE on success, FALSE otherwise.
+	 * @return boolean|null Returns TRUE on success, FALSE otherwise.
 	 */
 	public static function unregister_authenticator($authenticator) {
 		if(call_user_func(array($authenticator, 'on_unregister')) === true) {
@@ -164,6 +164,7 @@ 
 	 * Set a default authenticator (shows first in tabs)
 	 *
 	 * @param string
+	 * @param string $authenticator
 	 */
 	public static function set_default_authenticator($authenticator) {
 		self::$default_authenticator = $authenticator;

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));

security/Member.php

Doc Comments +3 added lines, -1 removed lines

@@ -585,6 +585,8 @@ 
 
 	/**
 	 * Utility for generating secure password hashes for this member.
+	 * @param string $string
+	 * @return string
 	 */
 	public function encryptWithUserSettings($string) {
 		if (!$string) return null;
@@ -735,7 +737,7 @@ 
 	/**
 	 * Returns the current logged in user
 	 *
-	 * @return Member|null
+	 * @return DataObject|null
 	 */
 	public static function currentUser() {
 		$id = Member::currentUserID();

security/MemberPassword.php

Doc Comments +1 added lines

@@ -32,6 +32,7 @@
 	/**
 	 * Log a password change from the given member.
 	 * Call MemberPassword::log($this) from within Member whenever the password is changed.
+	 * @param Member $member
 	 */
 	public static function log($member) {
 		$record = new MemberPassword();

security/PasswordValidator.php

Doc Comments +4 added lines, -2 removed lines

@@ -28,6 +28,7 @@ 
 
 	/**
 	 * Minimum password length
+	 * @param integer $minLength
 	 */
 	public function minLength($minLength) {
 		$this->minLength = $minLength;
@@ -39,8 +40,8 @@ 
 	 *
 	 * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation"))
 	 *
-	 * @param $minScore The minimum number of character tests that must pass
-	 * @param $testNames The names of the tests to perform
+	 * @param integer $minScore The minimum number of character tests that must pass
+	 * @param string[] $testNames The names of the tests to perform
 	 */
 	public function characterStrength($minScore, $testNames) {
 		$this->minScore = $minScore;
@@ -50,6 +51,7 @@ 
 
 	/**
 	 * Check a number of previous passwords that the user has used, and don't let them change to that.
+	 * @param integer $count
 	 */
 	public function checkHistoricalPasswords($count) {
 		$this->historicalPasswordCount = $count;

security/Permission.php

Doc Comments +2 added lines, -2 removed lines

@@ -652,7 +652,7 @@ 
 	 * Recursively traverse the nested list of declared permissions and create
 	 * a linear list.
 	 *
-	 * @param aeeay $declared Nested structure of permissions.
+	 * @param boolean $declared Nested structure of permissions.
 	 * @param $list List of permissions in the structure. The result will be
 	 *              written to this array.
 	 */
@@ -740,7 +740,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.

tasks/EncryptAllPasswordsTask.php

Doc Comments +1 added lines

@@ -66,6 +66,7 @@
 
 	/**
 	 * @todo This should really be taken care of by TestRunner
+	 * @param string $msg
 	 */
 	protected function debugMessage($msg) {
 		if(class_exists('SapphireTest', false) && !SapphireTest::is_running_test()) {