silverstripe / silverstripe-framework

Control/HTTPRequest.php

Doc Comments +2 added lines, -2 removed lines

@@ -427,9 +427,9 @@
 	 * it's only advisable to send small files through this method.
 	 *
 	 * @static
-	 * @param $fileData
+	 * @param string $fileData
 	 * @param $fileName
-	 * @param null $mimeType
+	 * @param string $mimeType
 	 * @return SS_HTTPResponse
 	 */
 	public static function send_file($fileData, $fileName, $mimeType = null) {

Control/RequestHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 	 *
 	 * Must not raise HTTPResponse_Exceptions - instead it should return
 	 *
-	 * @param $request
+	 * @param HTTPRequest $request
 	 * @param $action
 	 * @return HTTPResponse
 	 */

View/Parsers/HTMLValue.php

Doc Comments +1 added lines

@@ -139,6 +139,7 @@
 	/**
 	 * Get the body element, or false if there isn't one (we haven't loaded any content
 	 * or this instance is in an invalid state)
+	 * @return \DOMElement
 	 */
 	public function getBody() {
 		$doc = $this->getDocument();

Core/Convert.php

Doc Comments +6 added lines, -5 removed lines

@@ -54,9 +54,9 @@ 
 	 *
 	 * @see http://www.w3.org/TR/REC-html40/types.html#type-cdata
 	 *
-	 * @param array|string $val String to escape, or array of strings
+	 * @param string $val String to escape, or array of strings
 	 *
-	 * @return array|string
+	 * @return string
 	 */
 	public static function raw2htmlname($val) {
 		if(is_array($val)) {
@@ -182,7 +182,7 @@ 
 	 * table, or column name. Supports encoding of multi identfiers separated by
 	 * a delimiter (e.g. ".")
 	 *
-	 * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers
+	 * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers
 	 * to be joined via the separator.
 	 * @param string $separator The string that delimits subsequent identifiers
 	 * @return string The escaped identifier. E.g. '"SiteTree"."Title"'
@@ -196,7 +196,7 @@ 
 	 * @uses html2raw()
 	 * @todo Currently &#xxx; entries are stripped; they should be converted
 	 * @param mixed $val
-	 * @return array|string
+	 * @return string
 	 */
 	public static function xml2raw($val) {
 		if(is_array($val)) {
@@ -267,6 +267,7 @@ 
 	 * call this function directly, Please use {@link Convert::xml2array()}
 	 *
 	 * @param SimpleXMLElement
+	 * @param SimpleXMLElement $xml
 	 *
 	 * @return mixed
 	 */
@@ -469,7 +470,7 @@ 
 	 * - IDField => idField
 	 * - iDField => iDField
 	 *
-	 * @param $str
+	 * @param string $str
 	 * @return string
 	 */
 	public static function upperCamelToLowerCamel($str) {

Core/Manifest/ClassManifest.php

Doc Comments +2 added lines, -2 removed lines

@@ -218,7 +218,7 @@ 
 	/**
 	 * Returns a lowercase array of all the class names in the manifest.
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function getClassNames() {
 		return array_keys($this->classes);
@@ -246,7 +246,7 @@ 
 	 * Returns an array containing all the descendants (direct and indirect)
 	 * of a class.
 	 *
-	 * @param  string|object $class
+	 * @param  string $class
 	 * @return array
 	 */
 	public function getDescendantsOf($class) {

Dev/BulkLoader_Result.php

Doc Comments +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 
 	/**
 	 * @param $obj DataObject
-	 * @param $message string
+	 * @param string $message string
 	 */
 	public function addCreated($obj, $message = null)
 	{
@@ -147,7 +147,7 @@ 
 
 	/**
 	 * @param $obj DataObject
-	 * @param $message string
+	 * @param string $message string
 	 */
 	public function addUpdated($obj, $message = null)
 	{

Forms/AssetField.php

Doc Comments +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	/**
 	 * Determine if the target folder for new uploads in is visible the field UI.
 	 *
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canPreviewFolder() {
 		if(!$this->isActive()) {
@@ -375,7 +375,7 @@ 
 	/**
 	 * Determine if the user has permission to upload.
 	 *
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canUpload() {
 		if(!$this->isActive()) {

Forms/MultiSelectField.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	 * Load a value into this MultiSelectField
 	 *
 	 * @param mixed $val
-	 * @param null|array|DataObject $obj {@see Form::loadDataFrom}
+	 * @param DataObject|null $obj {@see Form::loadDataFrom}
 	 * @return $this
 	 */
 	public function setValue($val, $obj = null) {