silverstripe / silverstripe-framework

ORM/FieldType/DBField.php

Doc Comments +2 added lines, -2 removed lines

@@ -276,7 +276,7 @@ 
 	/**
 	 * Get the table this field belongs to, if assigned
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getTable() {
 		return $this->tableName;
@@ -476,7 +476,7 @@ 
 	}
 
 	/**
-	 * @param array $value
+	 * @param string $value
 	 * @return $this
 	 */
 	public function setArrayValue($value) {

Security/Security.php

Doc Comments +5 added lines, -5 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(
@@ -795,7 +795,7 @@ 
 	 * For use in any subclass.
 	 *
 	 * @param string $name
-	 * @return array Returns the template(s) for rendering
+	 * @return string[] Returns the template(s) for rendering
 	 */
 	public function getIncludeTemplate($name) {
 		return array('Security_' . $name);
@@ -883,7 +883,7 @@ 
 	 *
 	 * @param string $username The user name
 	 * @param string $password The password (in cleartext)
-	 * @return bool
+	 * @return false|null
 	 */
 	public static function setDefaultAdmin($username, $password) {
 		// don't overwrite if already set
@@ -970,7 +970,7 @@ 
 	 * @deprecated 4.0 Use the "Security.password_encryption_algorithm" config setting instead
 	 * @param string $algorithm One of the available password encryption
 	 *  algorithms determined by {@link Security::get_encryption_algorithms()}
-	 * @return bool Returns TRUE if the passed algorithm was valid, otherwise FALSE.
+	 * @return boolean|null Returns TRUE if the passed algorithm was valid, otherwise FALSE.
 	 */
 	public static function set_password_encryption_algorithm($algorithm) {
 		Deprecation::notice('4.0', 'Use the "Security.password_encryption_algorithm" config setting instead');
@@ -1138,7 +1138,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;

forms/DropdownField.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 	/**
 	 * @param array $properties
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function FieldHolder($properties = array()) {
 		return $this->Field($properties);