From 349f3bf54a81af8467a62f1681bcaca172262446 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 9 Feb 2016 10:40:00 +0100
Subject: [PATCH] More fixes

---
 lib/private/share/share.php |  4 ++--
 lib/private/template.php    | 22 +++++++---------------
 lib/private/updater.php     |  1 -
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 51d98fff792..b09adf1aa99 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2300,10 +2300,10 @@ class Share extends Constants {
 	/**
 	 * @param string $itemType
 	 * @param string $itemSource
-	 * @param integer $shareType
+	 * @param int $shareType
 	 * @param string $shareWith
 	 * @param string $uidOwner
-	 * @param integer $permissions
+	 * @param int $permissions
 	 * @param string|null $itemSourceName
 	 * @param null|\DateTime $expirationDate
 	 */
diff --git a/lib/private/template.php b/lib/private/template.php
index d068150b33b..bc706e29344 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -53,26 +53,18 @@ class OC_Template extends \OC\Template\Base {
 	/** @var string */
 	protected $app; // app id
 
+	protected static $initTemplateEngineFirstRun = true;
+
 	/**
 	 * Constructor
+	 *
 	 * @param string $app app providing the template
 	 * @param string $name of the template file (without suffix)
-	 * @param string $renderAs = ""; produce a full page
+	 * @param string $renderAs If $renderAs is set, OC_Template will try to
+	 *                         produce a full page in the according layout. For
+	 *                         now, $renderAs can be set to "guest", "user" or
+	 *                         "admin".
 	 * @param bool $registerCall = true
-	 * @return OC_Template object
-	 *
-	 * This function creates an OC_Template object.
-	 *
-	 * If $renderAs is set, OC_Template will try to produce a full page in the
-	 * according layout. For now, $renderAs can be set to "guest", "user" or
-	 * "admin".
-	 */
-	
-	protected static $initTemplateEngineFirstRun = true;
-	
-	/**
-	 * @param string $app
-	 * @param string $name
 	 */
 	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
 		// Read the selected theme from the config file
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 1c5e8a3a26e..78457ba3a80 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -286,7 +286,6 @@ class Updater extends BasicEmitter {
 	 * @param string $installedVersion previous version from which to upgrade from
 	 *
 	 * @throws \Exception
-	 * @return boolean|null true if the operation succeeded, false otherwise
 	 */
 	private function doUpgrade($currentVersion, $installedVersion) {
 		// Stop update if the update is over several major versions