silverstripe / silverstripe-framework

admin/code/CMSBatchAction.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 * @param $objs The SS_List of objects to perform this batch action
 	 * on.
 	 * @param $helperMethod The method to call on each of those objects.
-	 * @return JSON encoded map in the following format:
+	 * @return string encoded map in the following format:
 	 *  {
 	 *     'modified': {
 	 *       3: {'TreeTitle': 'Page3'},

admin/code/CMSMenu.php

Doc Comments +5 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	 *                          left.
 	 * @param array $attributes an array of attributes to include on the link.
 	 *
-	 * @return boolean The result of the operation.
+	 * @return boolean|null The result of the operation.
 	 */
 	public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null) {
 		return self::add_menu_item($code, $menuTitle, $url, null, $priority, $attributes);
@@ -106,7 +106,7 @@ 
 	 * 					have the rights to access some other part of the admin area.
 	 * @param array $attributes an array of attributes to include on the link.
 	 *
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
 											$attributes = null) {
@@ -237,7 +237,7 @@ 
 	 * 					have the rights to access some other part of the admin area.
 	 * @param array $attributes an array of attributes to include on the link.
 	 *
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function replace_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
 												$attributes = null) {
@@ -256,6 +256,8 @@ 
 	
 	/**
 	 * Add a previously built menu item object to the menu
+	 * @param string $code
+	 * @param CMSMenuItem $cmsMenuItem
 	 */
 	protected static function add_menu_item_obj($code, $cmsMenuItem) {
 		self::$menu_item_changes[] = array(

admin/code/CMSMenuItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	/**
 	 * @param array
 	 *
-	 * @return HTML
+	 * @return string
 	 */
 	public function getAttributesHTML($attrs = null) {
 		$exclude = (is_string($attrs)) ? func_get_args() : null;

admin/code/GroupImportForm.php

Doc Comments +4 added lines

@@ -14,6 +14,10 @@
 	 */
 	protected $group;
 
+	/**
+	 * @param SecurityAdmin $controller
+	 * @param string $name
+	 */
 	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
 		if(!$fields) {
 			$helpHtml = _t(

admin/code/MemberImportForm.php

Doc Comments +5 added lines, -1 removed lines

@@ -14,6 +14,10 @@ 
 	 */
 	protected $group;
 
+	/**
+	 * @param SecurityAdmin $controller
+	 * @param string $name
+	 */
 	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
 		if(!$fields) {
 			$helpHtml = _t(
@@ -100,7 +104,7 @@ 
 	}
 
 	/**
-	 * @param $group Group
+	 * @param DataObject $group Group
 	 */
 	public function setGroup($group) {
 		$this->group = $group;

api/JSONDataFormatter.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 * @param DataObjectInterface $obj
 	 * @param  $fields
 	 * @param  $relations
-	 * @return EmptyJSONObject
+	 * @return stdClass
 	 */
 	public function convertDataObjectToJSONObject(DataObjectInterface $obj, $fields = null, $relations = null) {
 		$className = $obj->class;

control/PjaxResponseNegotiator.php

Doc Comments +2 added lines, -3 removed lines

@@ -35,9 +35,9 @@ 
 	protected $fragmentOverride = null;
 
 	/**
-	 * @param RequestHandler $controller
 	 * @param SS_HTTPResponse An existing response to reuse (optional)
 	 * @param Array $callbacks
+	 * @param SS_HTTPResponse $response
 	 */
 	public function __construct($callbacks = array(), $response = null) {
 		$this->callbacks = $callbacks;
@@ -61,7 +61,6 @@ 
 	 * @param array $extraCallbacks List of anonymous functions or callables returning either a string
 	 * or SS_HTTPResponse, keyed by their fragment identifier. The 'default' key can
 	 * be used as a fallback for non-ajax responses.
-	 * @param array $fragmentOverride Change the response fragments.
 	 * @return SS_HTTPResponse
 	 */
 	public function respond(SS_HTTPRequest $request, $extraCallbacks = array()) {
@@ -109,7 +108,7 @@ 
 	/**
 	 * Set up fragment overriding - will completely replace the incoming fragments.
 	 *
-	 * @param array $fragments Fragments to insert.
+	 * @param string[] $fragments Fragments to insert.
 	 */
 	public function setFragmentOverride($fragments) {
 		if (!is_array($fragments)) throw new InvalidArgumentException();

control/RequestHandler.php

Doc Comments +6 added lines

@@ -121,6 +121,7 @@ 
 
 	/**
 	 * Set the DataModel for this request.
+	 * @param DataModel $model
 	 */
 	public function setDataModel($model) {
 		$this->model = $model;
@@ -238,6 +239,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param SS_HTTPRequest $request
+	 */
 	protected function findAction($request) {
 		$handlerClass = ($this->class) ? $this->class : get_class($this);
 
@@ -384,6 +388,7 @@ 
 
 	/**
 	 * Return the class that defines the given action, so that we know where to check allowed_actions.
+	 * @return string|null
 	 */
 	protected function definingClassForAction($actionOrigCasing) {
 		$action = strtolower($actionOrigCasing);
@@ -492,6 +497,7 @@ 
 	 * or {@link handleRequest()}, but in some based we want to set it manually.
 	 *
 	 * @param SS_HTTPRequest
+	 * @param SS_HTTPRequest $request
 	 */
 	public function setRequest($request) {
 		$this->request = $request;

core/ArrayLib.php

Doc Comments +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 	 *
 	 * Actually only one array argument is supported.
 	 *
-	 * @param $f callback to apply
+	 * @param string $f callback to apply
 	 * @param $array array
 	 * @return array
 	 */