sminnee / silverstripe-framework

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/ModelAdmin.php

Doc Comments +3 added lines

@@ -117,6 +117,9 @@
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ModelAdmin.js');
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function Link($action = null) {
 		if(!$action) $action = $this->sanitiseClassName($this->modelClass);
 		return parent::Link($action);

admin/code/CMSMenu.php

Doc Comments +3 added lines, -3 removed lines

@@ -99,7 +99,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);
@@ -119,7 +119,7 @@ 
 	 *                    have the rights to access some other part of the admin area.
 	 * @param int $priority
 	 * @param array $attributes an array of attributes to include on the link.
-	 * @return bool Success
+	 * @return boolean|null Success
 	 */
 	public static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
 											$attributes = null) {
@@ -250,7 +250,7 @@ 
 	 *                    have the rights to access some other part of the admin area.
 	 * @param int $priority
 	 * @param array $attributes an array of attributes to include on the link.
-	 * @return bool Success
+	 * @return boolean|null Success
 	 */
 	public static function replace_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1,
 												$attributes = null) {

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());

admin/code/MemberImportForm.php

Doc Comments +5 added lines, -1 removed lines

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

admin/code/SecurityAdmin.php

Doc Comments +2 added lines, -2 removed lines

@@ -251,7 +251,7 @@ 
 	/**
 	 * @see SecurityAdmin_MemberImportForm
 	 *
-	 * @return Form
+	 * @return null|MemberImportForm
 	 */
 	public function MemberImportForm() {
 		if(!Permission::check('ADMIN')) {
@@ -286,7 +286,7 @@ 
 	 * @see SecurityAdmin_MemberImportForm
 	 *
 	 * @skipUpgrade
-	 * @return Form
+	 * @return null|GroupImportForm
 	 */
 	public function GroupImportForm() {
 		if(!Permission::check('ADMIN')) {

tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php

Doc Comments +1 added lines

@@ -36,6 +36,7 @@
 
 	/**
 	 * Get Mink session from MinkContext
+	 * @return \Behat\Mink\Session
 	 */
 	public function getSession($name = null) {
 		return $this->getMainContext()->getSession($name);

admin/thirdparty/jstree/_demo/_inc/class._database_i.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $return;
 	}
 
+	/**
+	 * @param boolean $index
+	 */
 	function f($index) {
 		return stripslashes($this->row[$index]);
 	}

admin/thirdparty/jstree/_demo/_inc/class.tree.php

Doc Comments +16 added lines

@@ -61,9 +61,17 @@ 
 		return $path;
 	}
 
+	/**
+	 * @param integer $parent
+	 * @param integer $position
+	 */
 	function _create($parent, $position) {
 		return $this->_move(0, $parent, $position);
 	}
+
+	/**
+	 * @param integer $id
+	 */
 	function _remove($id) {
 		if((int)$id === 1) { return false; }
 		$data = $this->_get_node($id);
@@ -100,6 +108,10 @@ 
 		);
 		return true;
 	}
+
+	/**
+	 * @param integer $id
+	 */
 	function _move($id, $ref_id, $position = 0, $is_copy = false) {
 		if((int)$ref_id === 0 || (int)$id === 1) { return false; }
 		$sql		= array();						// Queries executed at the end
@@ -238,6 +250,10 @@ 
 		if($is_copy) $this->_fix_copy($ind, $position);
 		return $node === false || $is_copy ? $ind : true;
 	}
+
+	/**
+	 * @param integer $position
+	 */
 	function _fix_copy($id, $position) {
 		$node = $this->_get_node($id);
 		$children = $this->_get_children($id, true);