silverstripe / silverstripe-framework

src/Assets/Upload.php

Doc Comments +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
 	 * Set a different instance than {@link Upload_Validator}
 	 * for this upload session.
 	 *
-	 * @param object $validator
+	 * @param Upload_Validator $validator
 	 */
 	public function setValidator($validator) {
 		$this->validator = $validator;
@@ -363,7 +363,7 @@ 
 	/**
 	 * Determines wether previous operations caused an error.
 	 *
-	 * @return boolean
+	 * @return integer
 	 */
 	public function isError() {
 		return (count($this->errors));

src/Control/Controller.php

Doc Comments +3 added lines, -3 removed lines

@@ -142,6 +142,7 @@ 
 	 * {@inheritdoc}
 	 *
 	 * Also set the URLParams
+	 * @param HTTPRequest $request
 	 */
 	public function setRequest($request) {
 		$return = parent::setRequest($request);
@@ -501,7 +502,7 @@ 
 	 *
 	 * @param array $params
 	 *
-	 * @return string
+	 * @return DBHTMLText
 	 */
 	public function render($params = null) {
 		$template = $this->getViewer($this->getAction());
@@ -664,7 +665,7 @@ 
 	 * Tests whether a redirection has been requested. If redirect() has been called, it will return
 	 * the URL redirected to. Otherwise, it will return null.
 	 *
-	 * @return null|string
+	 * @return boolean
 	 */
 	public function redirectedTo() {
 		return $this->getResponse() && $this->getResponse()->getHeader('Location');
@@ -695,7 +696,6 @@ 
 	 *
 	 * Caution: All parameters are expected to be URI-encoded already.
 	 *
-	 * @param string|array $arg,.. One or more link segments, or list of link segments as an array
 	 * @return string
 	 */
 	public static function join_links($arg = null) {

src/Control/CookieJar.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 	 * @see http://uk3.php.net/manual/en/function.setcookie.php
 	 *
 	 * @param string $name The name of the cookie
-	 * @param string|array $value The value for the cookie to hold
+	 * @param false|string $value The value for the cookie to hold
 	 * @param int $expiry The number of days until expiry
 	 * @param string $path The path to save the cookie on (falls back to site base)
 	 * @param string $domain The domain to make the cookie available on

src/Control/Director.php

Doc Comments +3 added lines, -3 removed lines

@@ -534,7 +534,7 @@ 
 	 * Returns the domain part of the URL 'http://www.mysite.com'. Returns FALSE is this environment
 	 * variable isn't set.
 	 *
-	 * @return bool|string
+	 * @return string|false
 	 */
 	public static function protocolAndHost() {
 		$alternate = Config::inst()->get('Director', 'alternate_base_url');
@@ -869,7 +869,7 @@ 
 	/**
 	 * Returns true if the given file exists. Filename should be relative to the site root.
 	 *
-	 * @param $file
+	 * @param string $file
 	 *
 	 * @return bool
 	 */
@@ -1087,7 +1087,7 @@ 
 	 * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and
 	 * {@link Director::isLive()}.
 	 *
-	 * @return bool|string
+	 * @return string|false
 	 */
 	public static function get_environment_type() {
 		if(Director::isLive()) {

src/Control/Email/Email.php

Doc Comments +1 added lines, -1 removed lines

@@ -390,7 +390,7 @@
 	}
 
 	/**
-	 * @return Email|ViewableData_Customised
+	 * @return ViewableData
 	 */
 	protected function templateData() {
 		if($this->template_data) {

src/Control/Email/Mailer.php

Doc Comments +1 added lines, -1 removed lines

@@ -321,7 +321,7 @@
 	/**
 	 * Encode an array of parts using multipart
 	 *
-	 * @param array $parts List of parts
+	 * @param string[] $parts List of parts
 	 * @param string $contentType Content-type of parts
 	 * @param array $headers Existing headers to include in response
 	 * @return array Array with two items, the body followed by headers

src/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) {

src/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
 	 */

src/Control/RSS/RSSFeed.php

Doc Comments +1 added lines

@@ -227,6 +227,7 @@
 	 * via the standard template inclusion process.
 	 *
 	 * @param string
+	 * @param string|null $template
 	 */
 	public function setTemplate($template) {
 		$this->template = $template;