diff --git a/lib/private/AppFramework/Http.php b/lib/private/AppFramework/Http.php
index 526509a45838b1b58e9164cfe894d66c50769e4d..be1e178a05fa98f728a2f0148b098b129ef0dc91 100644
--- a/lib/private/AppFramework/Http.php
+++ b/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
diff --git a/lib/private/Command/QueueBus.php b/lib/private/Command/QueueBus.php
index 7f2fc88a703ff0c9e38ad60b707a5dd777870b1c..30cdd7740a90a87c4ebc9c37ec4951ca1a1d8922 100644
--- a/lib/private/Command/QueueBus.php
+++ b/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 = [];
 
diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php
index f5a44ba02eabfbb3926a4006594f3c38186d31d4..7ac0c6e49d5e8abc9ecbc20a8d6f58e761ca71ca 100644
--- a/lib/private/Files/FileInfo.php
+++ b/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'])) {
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 42f2170122ef12a02c39e4aeadd0a1c2aa69a6e1..bcef85bd17a2a20b5c8ae6d7f2c845c2a74d7537 100644
--- a/lib/private/Share20/Manager.php
+++ b/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);
diff --git a/lib/private/Tags.php b/lib/private/Tags.php
index b63435ff8382f376399ea3ee92cccc6b06c3d384..1947f0c07e6279c8e8b608bc58c63ca628601215 100644
--- a/lib/private/Tags.php
+++ b/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;
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php
index 120b19d1cff12c37f827066631c038ec5c4abca3..cd5ca7bb5ce185ce9d08fc6b4011659453ac9e8a 100644
--- a/lib/private/legacy/image.php
+++ b/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();
diff --git a/lib/private/legacy/template/functions.php b/lib/private/legacy/template/functions.php
index bca16b48c1ae950d23692c49e55db3ae8da3c488..1ef3541e880af090c99f57137eeb171dcc192e07 100644
--- a/lib/private/legacy/template/functions.php
+++ b/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}");
diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php
index 820e00ff963f2b56540d22f1cae9744d36b97776..cfc4bd494f2c35fc4cfec4a028eb839f408fd39c 100644
--- a/lib/public/AppFramework/Http/DataDisplayResponse.php
+++ b/lib/public/AppFramework/Http/DataDisplayResponse.php
@@ -35,7 +35,7 @@ class DataDisplayResponse extends Response {
 
 	/**
 	 * response data
-	 * @var string;
+	 * @var string
 	 */
 	protected $data;
 
diff --git a/lib/public/Files/FileInfo.php b/lib/public/Files/FileInfo.php
index f0f21087bbe3b841da83c64dcf0cf36cf9095204..0b90fb8fbf2ca512e9e03980c6d037498585422e 100644
--- a/lib/public/Files/FileInfo.php
+++ b/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();
diff --git a/lib/public/Util.php b/lib/public/Util.php
index e4ebdb5bfa75789779129568abc0f1ef53cc621b..04cdfe216d08f5ece16ed05ae3b956f859c909c8 100644
--- a/lib/public/Util.php
+++ b/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
 	 */