diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 66b50a8755..ab9d3e47d0 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Returns the data
 	 *
-	 * @return string | resource
+	 * @return string|resource
 	 */
 	public function get() {
 
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 1c16d03eab..0923b6cf1a 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -303,7 +303,7 @@ class MDB2SchemaReader {
 	}
 
 	/**
-	 * @param \SimpleXMLElement | string $xml
+	 * @param \SimpleXMLElement|string $xml
 	 * @return bool
 	 */
 	private function asBool($xml) {
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 492209b883..70d1f985a4 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -41,7 +41,7 @@ class OC_DB_StatementWrapper {
 	 * make execute return the result instead of a bool
 	 *
 	 * @param array $input
-	 * @return \OC_DB_StatementWrapper | int
+	 * @return \OC_DB_StatementWrapper|int
 	 */
 	public function execute($input=array()) {
 		if(OC_Config::getValue( "log_query", false)) {
diff --git a/lib/private/files.php b/lib/private/files.php
index c435f8d168..7c437a16a9 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -225,7 +225,7 @@ class OC_Files {
 	 * checks if the selected files are within the size constraint. If not, outputs an error page.
 	 *
 	 * @param string $dir
-	 * @param array | string $files
+	 * @param array|string $files
 	 */
 	static function validateZipDownload($dir, $files) {
 		if (!OC_Config::getValue('allowZipDownload', true)) {
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index e857d45188..6aab2173da 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -109,7 +109,7 @@ class Cache {
 	 * get the stored metadata of a file or folder
 	 *
 	 * @param string/int $file
-	 * @return array | false
+	 * @return array|false
 	 */
 	public function get($file) {
 		if (is_string($file) or $file == '') {
@@ -597,7 +597,7 @@ class Cache {
 	 * get the path of a file on this storage by it's id
 	 *
 	 * @param int $id
-	 * @return string | null
+	 * @return string|null
 	 */
 	public function getPathById($id) {
 		$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 48aa6f853c..599752a6ef 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -55,7 +55,7 @@ class Watcher {
 	 * check $path for updates
 	 *
 	 * @param string $path
-	 * @return boolean | array true if path was updated, otherwise the cached data is returned
+	 * @return boolean|array true if path was updated, otherwise the cached data is returned
 	 */
 	public function checkUpdate($path) {
 		if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index d6940f50bf..b64c5d4e11 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	}
 
 	/**
-	 * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType() {
 		if (isset($this->data['type'])) {
diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php
index 08d5ddf348..256630726d 100644
--- a/lib/private/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
@@ -28,7 +28,7 @@ class Mount {
 	private $loader;
 
 	/**
-	 * @param string | \OC\Files\Storage\Storage $storage
+	 * @param string|\OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
 	 * @param array $arguments (optional)\
 	 * @param \OC\Files\Storage\Loader $loader
diff --git a/lib/private/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
index cd1536d273..e693e7079a 100644
--- a/lib/private/files/type/templatemanager.php
+++ b/lib/private/files/type/templatemanager.php
@@ -19,7 +19,7 @@ class TemplateManager {
 	 * get the path of the template for a mimetype
 	 *
 	 * @param string $mimetype
-	 * @return string | null
+	 * @return string|null
 	 */
 	public function getTemplatePath($mimetype) {
 		if (isset($this->templates[$mimetype])) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index d3772e264a..a53c2fbb32 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -796,7 +796,7 @@ class View {
 	 * @param string $path
 	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
 	 * defaults to true
-	 * @return \OC\Files\FileInfo | false
+	 * @return \OC\Files\FileInfo|false
 	 */
 	public function getFileInfo($path, $includeMountPoints = true) {
 		$data = array();
@@ -991,7 +991,7 @@ class View {
 	 * change file metadata
 	 *
 	 * @param string $path
-	 * @param array | \OCP\Files\FileInfo $data
+	 * @param array|\OCP\Files\FileInfo $data
 	 * @return int
 	 *
 	 * returns the fileid of the updated file
diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index abdf09a922..18c060e9b2 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -217,7 +217,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return int | false
+	 * @return int|false
 	 */
 	public function countUsersInGroup($gid, $search = '') {
 		$stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?');
diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php
index 1ef81c6bf9..7a766a6b35 100644
--- a/lib/private/group/dummy.php
+++ b/lib/private/group/dummy.php
@@ -159,7 +159,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 
 	/**
 	 * @brief get the number of all users in a group
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		if(isset($this->groups[$gid])) {
diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index 7593bb68d1..69641854dc 100644
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -26,7 +26,7 @@ class Group {
 	private $usersLoaded;
 
 	/**
-	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend
+	 * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend
 	 */
 	private $backends;
 
@@ -184,7 +184,7 @@ class Group {
 	 * returns the number of users matching the search string
 	 *
 	 * @param string $search
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function count($search) {
 		$users = false;
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 3eb894a644..f03f700413 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter;
  */
 class Manager extends PublicEmitter {
 	/**
-	 * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends
+	 * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends
 	 */
 	private $backends = array();
 
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 6f8830e73f..211c7e7cb1 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * Based on the given token the share information will be returned - password protected shares will be verified
 	 * @param string $token
-	 * @return array | boolean false will be returned in case the token is unknown or unauthorized
+	 * @return array|boolean false will be returned in case the token is unknown or unauthorized
 	 */
 	public static function getShareByToken($token, $checkPasswordProtection = true) {
 		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 7b09f58017..d8694ac6ed 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -35,7 +35,7 @@ class Updater extends BasicEmitter {
 	/**
 	 * Check if a new version is available
 	 * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
-	 * @return array | bool
+	 * @return array|bool
 	 */
 	public function check($updaterUrl) {
 
diff --git a/lib/private/user.php b/lib/private/user.php
index 7f8d7bf263..2ba681cd4a 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -98,7 +98,7 @@ class OC_User {
 
 	/**
 	 * @brief Adds the backend to the list of used backends
-	 * @param string | OC_User_Backend $backend default: database The backend to use for user management
+	 * @param string|OC_User_Backend $backend default: database The backend to use for user management
 	 * @return bool
 	 *
 	 * Set the User Authentication Module
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index d54b0567a1..284b358259 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend {
 	/**
 	 * counts the users in the database
 	 *
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		$query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index 2fb51d02de..d2ada37c80 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend {
 	/**
 	 * counts the users in the database
 	 *
-	 * @return int | bool
+	 * @return int|bool
 	 */
 	public function countUsers() {
 		return 0;
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 939f99618d..6765491e69 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -222,7 +222,7 @@ class Manager extends PublicEmitter {
 	 * @param string $uid
 	 * @param string $password
 	 * @throws \Exception
-	 * @return bool | \OC\User\User the created user of false
+	 * @return bool|\OC\User\User the created user of false
 	 */
 	public function createUser($uid, $password) {
 		$l = \OC_L10N::get('lib');
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index ef5364cbf7..abdbef38d9 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -33,7 +33,7 @@ class User {
 	private $enabled;
 
 	/**
-	 * @var Emitter | Manager $emitter
+	 * @var Emitter|Manager $emitter
 	 */
 	private $emitter;
 
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index 37162e0933..bf0c31918c 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -104,7 +104,7 @@ interface FileInfo {
 	/**
 	 * Check whether this is a file or a folder
 	 *
-	 * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
+	 * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType();
 
diff --git a/lib/public/share.php b/lib/public/share.php
index b21b3a7b96..018386253b 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants {
 	/**
 	 * Based on the given token the share information will be returned - password protected shares will be verified
 	 * @param string $token
-	 * @return array | bool false will be returned in case the token is unknown or unauthorized
+	 * @return array|bool false will be returned in case the token is unknown or unauthorized
 	 */
 	public static function getShareByToken($token, $checkPasswordProtection = true) {
 		return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);