Merge pull request #6864 from nextcloud/phpdoc-fix-issues

Fix some issues in phpDoc comments

lib/private/AppFramework/Http.php

@@ -111,7 +111,7 @@ class Http extends BaseHttp {
 
 	/**
 	 * Gets the correct header
-	 * @param Http::CONSTANT $status the constant from the Http class
+	 * @param int Http::CONSTANT $status the constant from the Http class
 	 * @param \DateTime $lastModified formatted last modified date
 	 * @param string $ETag the etag
 	 * @return string

lib/private/Command/QueueBus.php

@@ -27,7 +27,7 @@ use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
 	/**
-	 * @var (ICommand|callable)[]
+	 * @var ICommand[]|callable[]
 	 */
 	private $queue = [];
 

lib/private/Files/FileInfo.php

@@ -232,7 +232,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	}
 
 	/**
-	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType() {
 		if (!isset($this->data['type'])) {

lib/private/Share20/Manager.php

@@ -1395,7 +1395,7 @@ class Manager implements IManager {
 
 	/**
 	 * Create a new share
-	 * @return \OCP\Share\IShare;
+	 * @return \OCP\Share\IShare
 	 */
 	public function newShare() {
 		return new \OC\Share20\Share($this->rootFolder, $this->userManager);

lib/private/Tags.php

@@ -140,7 +140,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Check if any tags are saved for this type and user.
 	*
-	* @return boolean.
+	* @return boolean
 	*/
 	public function isEmpty() {
 		return count($this->tags) === 0;

lib/private/legacy/image.php

@@ -431,7 +431,7 @@ class OC_Image implements \OCP\IImage {
 	 * (I'm open for suggestions on better method name ;)
 	 * Fixes orientation based on EXIF data.
 	 *
-	 * @return bool.
+	 * @return bool
 	 */
 	public function fixOrientation() {
 		$o = $this->getOrientation();

lib/private/legacy/template/functions.php

@@ -278,7 +278,7 @@ function human_file_size( $bytes ) {
 /**
  * Strips the timestamp of its time value
  * @param int $timestamp UNIX timestamp to strip
- * @return $timestamp without time value
+ * @return int timestamp without time value
  */
 function strip_time($timestamp){
 	$date = new \DateTime("@{$timestamp}");

lib/public/AppFramework/Http/DataDisplayResponse.php

@@ -35,7 +35,7 @@ class DataDisplayResponse extends Response {
 
 	/**
 	 * response data
-	 * @var string;
+	 * @var string
 	 */
 	protected $data;
 

lib/public/Files/FileInfo.php

@@ -174,7 +174,7 @@ interface FileInfo {
 	/**
 	 * Check whether this is a file or a folder
 	 *
-	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 * @since 7.0.0
 	 */
 	public function getType();

lib/public/Util.php

@@ -670,7 +670,7 @@ class Util {
 	 * Compare two strings to provide a natural sort
 	 * @param string $a first string to compare
 	 * @param string $b second string to compare
-	 * @return -1 if $b comes before $a, 1 if $a comes before $b
+	 * @return int -1 if $b comes before $a, 1 if $a comes before $b
 	 * or 0 if the strings are identical
 	 * @since 7.0.0
 	 */