silverstripe / silverstripe-framework

forms/TreeDropdownField.php

Doc Comments +2 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 	 *
 	 * @param string $name the field name
 	 * @param string $title the field label
-	 * @param string|array $sourceObject The object-type to list in the tree. This could
+	 * @param string $sourceObject The object-type to list in the tree. This could
 	 * be one of the following:
 	 * - A DataObject class name with the {@link Hierarchy} extension.
 	 * - An array of key/value pairs, like a {@link DropdownField} source. In
@@ -211,7 +211,7 @@ 
 	}
 
 	/**
-	 * @return HTMLText
+	 * @return string
 	 */
 	public function Field($properties = array()) {
 		Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/javascript/lang');
@@ -446,7 +446,6 @@ 
 	}
 
 	/**
-	 * @param string $field
 	 * @return $this
 	 */
 	public function setSourceObject($class) {

forms/UploadField.php

Doc Comments +3 added lines, -2 removed lines

@@ -305,6 +305,7 @@ 
 
 	/**
 	 * @param String
+	 * @param string $name
 	 */
 	public function setDisplayFolderName($name) {
 		$this->displayFolderName = $name;
@@ -1046,7 +1047,7 @@ 
 
 	/**
 	 * @param SS_HTTPRequest $request
-	 * @return UploadField_ItemHandler
+	 * @return UploadField_SelectHandler
 	 */
 	public function handleSelect(SS_HTTPRequest $request) {
 		if(!$this->canAttachExisting()) return $this->httpError(403);
@@ -1404,7 +1405,7 @@ 
 	 * Action to handle editing of a single file
 	 *
 	 * @param SS_HTTPRequest $request
-	 * @return ViewableData_Customised
+	 * @return HTMLText
 	 */
 	public function edit(SS_HTTPRequest $request) {
 		// Check form field state

parsers/ShortcodeParser.php

Doc Comments +6 added lines

@@ -162,6 +162,9 @@ 
 
 	// --------------------------------------------------------------------------------------------------------------
 
+	/**
+	 * @param DOMElement $node
+	 */
 	protected function removeNode($node) {
 		$node->parentNode->removeChild($node);
 	}
@@ -177,6 +180,9 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMElement $after
+	 */
 	protected function insertListAfter($new, $after) {
 		$doc = $after->ownerDocument; $parent = $after->parentNode; $next = $after->nextSibling;
 

security/PasswordEncryptor.php

Doc Comments +5 added lines

@@ -85,6 +85,10 @@ 
 	 * but is necessary for retain compatibility with password hashed
 	 * with flawed algorithms - see {@link PasswordEncryptor_LegacyPHPHash} and
 	 * {@link PasswordEncryptor_Blowfish}
+	 * @param string $hash
+	 * @param string $password
+	 * @param string $salt
+	 * @param Member $member
 	 */
 	public function check($hash, $password, $salt = null, $member = null) {
 		return $hash === $this->encrypt($password, $salt, $member);
@@ -241,6 +245,7 @@ 
 
 	/**
 	 * self::$cost param is forced to be two digits with leading zeroes for ints 4-9
+	 * @param string $password
 	 */
 	public function salt($password, $member = null) {
 		$generator = new RandomGenerator();

core/startup/AbstractConfirmationToken.php

Doc Comments +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 * Given a list of token names, suppress all tokens that have not been validated, and
 	 * return the non-validated token with the highest priority
 	 *
-	 * @param array $keys List of token keys in ascending priority (low to high)
+	 * @param string[] $keys List of token keys in ascending priority (low to high)
 	 * @return static The token container for the unvalidated $key given with the highest priority
 	 */
 	public static function prepare_tokens($keys) {
@@ -45,7 +45,7 @@ 
 	/**
 	 * Generate a local filesystem path to store a token
 	 *
-	 * @param $token
+	 * @param string $token
 	 * @return string
 	 */
 	protected function pathForToken($token) {