silverstripe / silverstripe-framework

admin/code/LeftAndMain.php

Doc Comments +4 added lines, -4 removed lines

@@ -252,7 +252,7 @@ 
 	/**
 	 * Gets the combined configuration of all LeafAndMain subclasses required by the client app.
 	 *
-	 * @return array
+	 * @return string
 	 *
 	 * WARNING: Experimental API
 	 */
@@ -691,7 +691,7 @@ 
 	 *
 	 * @param string $url
 	 * @param int $code
-	 * @return HTTPResponse|string
+	 * @return string|null
 	 */
 	public function redirect($url, $code=302) {
 		if($this->getRequest()->isAjax()) {
@@ -969,7 +969,7 @@ 
 	 * {@link SSViewer::get_templates_by_class()}
 	 *
 	 * @param string $suffix
-	 * @return array
+	 * @return string
 	 */
 	public function getTemplatesWithSuffix($suffix) {
 		$templates = SSViewer::get_templates_by_class(get_class($this), $suffix, __CLASS__);
@@ -2039,7 +2039,7 @@ 
 	}
 
 	/**
-	 * @return String
+	 * @return DBField
 	 */
 	public function Locale() {
 		return DBField::create_field('Locale', i18n::get_locale());

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

ORM/Versioning/ChangeSetItem.php

Doc Comments +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
 	 * Find version of this object in the given stage
 	 *
 	 * @param string $stage
-	 * @return DataObject|Versioned
+	 * @return DataObject|null
 	 * @throws UnexpectedDataException
 	 */
 	protected function getObjectInStage($stage) {
@@ -160,7 +160,7 @@ 
 
 	/**
 	 * Find latest version of this object
-	 * @return DataObject|Versioned
+	 * @return DataObject|null
 	 * @throws UnexpectedDataException
 	 */
 	protected function getObjectLatestVersion() {