silverstripe / silverstripe-framework

thirdparty/Zend/Loader/Autoloader/Resource.php

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
      * Helper method to calculate the correct class path
      *
      * @param string $class
-     * @return False if not matched other wise the correct path
+     * @return false|string if not matched other wise the correct path
      */
     public function getClassPath($class)
     {

thirdparty/Zend/Loader/PluginLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
      * Whether or not a Plugin by a specific name is loaded
      *
      * @param string $name
-     * @return Zend_Loader_PluginLoader
+     * @return boolean
      */
     public function isLoaded($name)
     {

ORM/Connect/Database.php

Doc Comments +1 added lines, -1 removed lines

@@ -718,7 +718,7 @@
 	 * @param boolean $create Flag indicating whether the database should be created
 	 * if it doesn't exist. If $create is false and the database doesn't exist
 	 * then an error will be raised
-	 * @param int|boolean $errorLevel The level of error reporting to enable for the query, or false if no error
+	 * @param boolean $errorLevel The level of error reporting to enable for the query, or false if no error
 	 * should be raised
 	 * @return boolean Flag indicating success
 	 */

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;

thirdparty/Zend/Cache/Core.php

Doc Comments +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
     /**
      * Returns the backend
      *
-     * @return Zend_Cache_Backend backend object
+     * @return Zend_Cache_Backend_Interface backend object
      */
     public function getBackend()
     {

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

@@ -412,7 +412,7 @@ 
 	 * Check if this file can be modified
 	 *
 	 * @param Member $member
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canEdit($member = null) {
 		if(!$member) {
@@ -432,7 +432,7 @@ 
 	 *
 	 * @param Member $member
 	 * @param array $context
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canCreate($member = null, $context = array()) {
 		if(!$member) {
@@ -451,7 +451,7 @@ 
 	 * Check if this file can be deleted
 	 *
 	 * @param Member $member
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	public function canDelete($member = null) {
 		if(!$member) {
@@ -647,7 +647,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()) {
@@ -1020,6 +1020,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) {
@@ -1163,7 +1164,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) {