sminnee / silverstripe-framework

ORM/Hierarchy/Hierarchy.php

Doc Comments +2 added lines, -2 removed lines

@@ -379,7 +379,7 @@ 
 	/**
 	 * Return the IDs of all the marked nodes.
 	 *
-	 * @return array
+	 * @return integer[]
 	 */
 	public function markedNodeIDs() {
 		return array_keys($this->markedNodes);
@@ -756,7 +756,7 @@ 
 	 * Get the next node in the tree of the type. If there is no instance of the className descended from this node,
 	 * then search the parents.
 	 * @param string     $className Class name of the node to find.
-	 * @param string|int $root      ID/ClassName of the node to limit the search to
+	 * @param integer $root      ID/ClassName of the node to limit the search to
 	 * @param DataObject $afterNode Used for recursive calls to this function
 	 * @return DataObject
 	 */

Security/CMSSecurity.php

Doc Comments +6 added lines

@@ -52,6 +52,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function Link($action = null) {
 		/** @skipUpgrade */
 		return Controller::join_links(Director::baseURL(), "CMSSecurity", $action);
@@ -68,6 +71,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $title
+	 */
 	public function getResponseController($title) {
 		// Use $this to prevent use of Page to render underlying templates
 		return $this;

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

Assets/File.php

Doc Comments +5 added lines, -5 removed lines

@@ -408,7 +408,7 @@ 
 	 * Check if this file can be modified
 	 *
 	 * @param Member $member
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canEdit($member = null) {
 		if(!$member) {
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param Member $member
 	 * @param array $context
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canCreate($member = null, $context = array()) {
 		if(!$member) {
@@ -447,7 +447,7 @@ 
 	 * Check if this file can be deleted
 	 *
 	 * @param Member $member
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canDelete($member = null) {
 		if(!$member) {
@@ -643,7 +643,7 @@ 
 	 *
 	 * @param string $condition The PHP condition to be evaluated.  The page will be called $item
 	 * @param array $collator An array, passed by reference, to collect all of the matching descendants.
-	 * @return true|null
+	 * @return boolean|null
 	 */
 	public function collateDescendants($condition, &$collator) {
 		if($children = $this->Children()) {
@@ -1016,6 +1016,7 @@ 
 	 *
 	 * @param String File extension, without dot prefix. Use an asterisk ('*')
 	 * to specify a generic fallback if no mapping is found for an extension.
+	 * @param string $ext
 	 * @return String Classname for a subclass of {@link File}
 	 */
 	public static function get_class_for_file_extension($ext) {
@@ -1159,7 +1160,6 @@ 
 	 * Note that the result will not have a leading slash, and should not be used
 	 * with local file paths.
 	 *
-	 * @param string $part,... Parts
 	 * @return string
 	 */
 	public static function join_paths($part = null) {

Assets/Flysystem/AssetAdapter.php

Doc Comments +3 added lines

@@ -40,6 +40,9 @@
         ]
 	);
 
+	/**
+	 * @param string $root
+	 */
 	public function __construct($root = null, $writeFlags = LOCK_EX, $linkHandling = self::DISALLOW_LINKS) {
 		// Get root path
 		$root = $this->findRoot($root);

Assets/Folder.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	 * Find the given folder or create it as a database record
 	 *
 	 * @param string $folderPath Directory path relative to assets root
-	 * @return Folder|null
+	 * @return null|\SilverStripe\ORM\DataObject
 	 */
 	public static function find_or_make($folderPath) {
 		// replace leading and trailing slashes

Assets/GDBackend.php

Doc Comments +3 added lines, -4 removed lines

@@ -191,7 +191,7 @@ 
 	 * Check if this image has previously crashed GD when attempting to open it - if it's opened
 	 * successfully, the manipulation's cache key is removed.
 	 *
-	 * @param string $arg,... Any number of args that identify this image
+	 * @param string $arg
 	 * @return bool True if failed
 	 */
 	public function failedResample($arg = null) {
@@ -202,7 +202,7 @@ 
 	/**
 	 * Mark a file as failed
 	 *
-	 * @param string $arg,... Any number of args that identify this image
+	 * @param string $arg
 	 */
 	protected function markFailed($arg = null) {
 		$key = sha1(implode('|', func_get_args()));
@@ -212,7 +212,6 @@ 
 	/**
 	 * Mark a file as succeeded
 	 *
-	 * @param string $arg,... Any number of args that identify this image
 	 */
 	protected function markSucceeded($arg = null) {
 		$key = sha1(implode('|', func_get_args()));
@@ -363,7 +362,7 @@ 
 	 * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu)
 	 *
 	 * @param float $angle Angle in degrees
-	 * @return static
+	 * @return null|resource
 	 */
 	public function rotatePixelByPixel($angle) {
 		if(!$this->gd) {

Assets/ImageManipulation.php

Doc Comments -1 removed lines

@@ -762,7 +762,6 @@
 	 * Name a variant based on a format with arbitrary parameters
 	 *
 	 * @param string $format The format name.
-	 * @param mixed $arg,... Additional arguments
 	 * @return string
 	 * @throws InvalidArgumentException
 	 */