Revert "Downstream 2016-06-08"

16 files changed, 29 insertions, 180 deletions

diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js
index a7a3e4e4c31..21a67883ac3 100644
--- a/lib/l10n/ar.js
+++ b/lib/l10n/ar.js
@@ -1,46 +1,18 @@
 OC.L10N.register(
     "lib",
     {
-    "Cannot write into \"config\" directory!" : "الكتابة في مجلد \"config\" غير ممكنة!",
-    "This can usually be fixed by giving the webserver write access to the config directory" : "يمكن حل هذا عادة بإعطاء خادم الوب صلاحية الكتابة في مجلد config",
-    "See %s" : "أنظر %s",
-    "Sample configuration detected" : "تم اكتشاف إعدادات عيّنة",
-    "PHP %s or higher is required." : "إصدار PHP %s أو أحدث منه مطلوب.",
-    "PHP with a version lower than %s is required." : "PHP الإصدار %s أو أقل مطلوب.",
-    "%sbit or higher PHP required." : "مكتبات PHP ذات %s بت أو أعلى مطلوبة.",
-    "Following databases are supported: %s" : "قواعد البيانات التالية مدعومة: %s",
-    "The command line tool %s could not be found" : "لم يتم العثور على أداة سطر الأوامر %s",
-    "The library %s is not available." : "مكتبة %s غير متوفرة.",
     "Unknown filetype" : "نوع الملف غير معروف",
     "Invalid image" : "الصورة غير صالحة",
     "today" : "اليوم",
     "yesterday" : "يوم أمس",
-    "_%n day ago_::_%n days ago_" : ["قبل ساعات","قبل يوم","قبل يومين","قبل %n يوماً","قبل %n يوماً","قبل %n يوماً"],
     "last month" : "الشهر الماضي",
-    "_%n month ago_::_%n months ago_" : ["قبل عدة أيام","قبل شهر","قبل شهرين","قبل %n شهراً","قبل %n شهراً","قبل %n شهراً"],
     "last year" : "السنةالماضية",
     "seconds ago" : "منذ ثواني",
-    "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات",
-    "4-byte characters are not supported in file names" : "المحارف ذات 4 بايت غير مسموح بها في أسماء الملفات",
-    "File name is a reserved word" : "اسم الملف كلمة محجوزة",
-    "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
-    "File name is too long" : "اسم الملف طويل جداً",
     "App directory already exists" : "مجلد التطبيق موجود مسبقا",
     "Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
-    "Archive does not contain a directory named %s" : "الأرشيف لا يحتوي مجلداً اسمه %s",
     "No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
-    "No href specified when installing app from http" : "لم يتم تحديد href عند تثبيت التطبيق من http",
-    "No path specified when installing app from local file" : "لم يتم تحديد مسار عند تثبيت التطبيق من ملف محلّي",
     "Archives of type %s are not supported" : "الأرشيفات من نوع  %s غير مدعومة",
-    "Failed to open archive when installing app" : "فشل فتح الأرشيف أثناء تثبيت التطبيق",
     "App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
-    "App cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق لأن ملف appinfo غير ممكنة قراءته.",
-    "Signature could not get checked. Please contact the app developer and check your admin screen." : "لم يتم التحقق من التوقيع.  فضلاً اتصل بمطوّر التطبيق و تحقق من شاشة الإدارة في حسابك.",
-    "App can't be installed because of not allowed code in the App" : "لم يتم تثبيت التطبيق لوجود شفرة غير مسموح بها في التطبيق",
-    "App can't be installed because it is not compatible with this version of ownCloud" : "لم يتم تثبيت التطبيق لأنه غير متوافق مع هذا الإصدار من ownCloud",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "لم يتم تثبيت التطبيق لأن به علامة <shipped>true</shipped> التي لايسمح بها في التطبيقات غير المشحونة",
-    "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "لم يتم تثبيت التطبيق لأن الإصدار في info.xml مختلف عن الإصدار المذكور في متجر التطبيقات",
-    "%s enter the database username and name." : "%s أدخِل اسم قاعدة البيانات واسم مستخدمها.",
     "%s enter the database username." : "%s ادخل اسم المستخدم الخاص بقاعدة البيانات.",
     "%s enter the database name." : "%s ادخل اسم فاعدة البيانات",
     "%s you may not use dots in the database name" : "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
@@ -51,20 +23,9 @@ OC.L10N.register(
     "You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
     "Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
     "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
-    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "نظام ماك الإصدار X غير مدعوم و %s لن يعمل بشكل صحيح على هذه المنصة.  استخدمه على مسؤوليتك!",
-    "For the best results, please consider using a GNU/Linux server instead." : "فضلاً ضع في الاعتبار استخدام نظام GNU/Linux بدل الأنظمة الأخرى للحصول على أفضل النتائج.",
-    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "فضلاً إحذف إعداد open_basedir من ملف php.ini لديك أو حوّل إلى PHP إصدار 64 بت.",
     "Set an admin username." : "اعداد اسم مستخدم للمدير",
     "Set an admin password." : "اعداد كلمة مرور للمدير",
-    "Can't create or write into the data directory %s" : "لا يمكن الإنشاء أو الكتابة في مجلد البيانات %s",
-    "Invalid Federated Cloud ID" : "معرّف سحابة الاتحاد غير صالح",
     "%s shared »%s« with you" : "%s شارك »%s« معك",
-    "%s via %s" : "%s عبر %s",
-    "Sharing %s failed, because the file does not exist" : "فشلت مشاركة %s فالملف غير موجود",
-    "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s",
-    "Sharing %s failed, because you can not share with yourself" : "فشلت مشاركة %s لأنك لايمكنك المشاركة مع نفسك",
-    "Sharing %s failed, because the user %s does not exist" : "فشلت مشاركة %s لأن المستخدم %s غير موجود",
-    "Share type %s is not valid for %s" : "مشاركة النوع %s غير صالحة لـ %s",
     "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
     "Apps" : "التطبيقات",
     "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
diff --git a/lib/l10n/ar.json b/lib/l10n/ar.json
index 86284a03538..eb91606bb52 100644
--- a/lib/l10n/ar.json
+++ b/lib/l10n/ar.json
@@ -1,44 +1,16 @@
 { "translations": {
-    "Cannot write into \"config\" directory!" : "الكتابة في مجلد \"config\" غير ممكنة!",
-    "This can usually be fixed by giving the webserver write access to the config directory" : "يمكن حل هذا عادة بإعطاء خادم الوب صلاحية الكتابة في مجلد config",
-    "See %s" : "أنظر %s",
-    "Sample configuration detected" : "تم اكتشاف إعدادات عيّنة",
-    "PHP %s or higher is required." : "إصدار PHP %s أو أحدث منه مطلوب.",
-    "PHP with a version lower than %s is required." : "PHP الإصدار %s أو أقل مطلوب.",
-    "%sbit or higher PHP required." : "مكتبات PHP ذات %s بت أو أعلى مطلوبة.",
-    "Following databases are supported: %s" : "قواعد البيانات التالية مدعومة: %s",
-    "The command line tool %s could not be found" : "لم يتم العثور على أداة سطر الأوامر %s",
-    "The library %s is not available." : "مكتبة %s غير متوفرة.",
     "Unknown filetype" : "نوع الملف غير معروف",
     "Invalid image" : "الصورة غير صالحة",
     "today" : "اليوم",
     "yesterday" : "يوم أمس",
-    "_%n day ago_::_%n days ago_" : ["قبل ساعات","قبل يوم","قبل يومين","قبل %n يوماً","قبل %n يوماً","قبل %n يوماً"],
     "last month" : "الشهر الماضي",
-    "_%n month ago_::_%n months ago_" : ["قبل عدة أيام","قبل شهر","قبل شهرين","قبل %n شهراً","قبل %n شهراً","قبل %n شهراً"],
     "last year" : "السنةالماضية",
     "seconds ago" : "منذ ثواني",
-    "Empty filename is not allowed" : "لا يسمح بأسماء فارغة للملفات",
-    "4-byte characters are not supported in file names" : "المحارف ذات 4 بايت غير مسموح بها في أسماء الملفات",
-    "File name is a reserved word" : "اسم الملف كلمة محجوزة",
-    "File name contains at least one invalid character" : "اسم الملف به ، على الأقل ، حرف غير صالح",
-    "File name is too long" : "اسم الملف طويل جداً",
     "App directory already exists" : "مجلد التطبيق موجود مسبقا",
     "Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
-    "Archive does not contain a directory named %s" : "الأرشيف لا يحتوي مجلداً اسمه %s",
     "No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
-    "No href specified when installing app from http" : "لم يتم تحديد href عند تثبيت التطبيق من http",
-    "No path specified when installing app from local file" : "لم يتم تحديد مسار عند تثبيت التطبيق من ملف محلّي",
     "Archives of type %s are not supported" : "الأرشيفات من نوع  %s غير مدعومة",
-    "Failed to open archive when installing app" : "فشل فتح الأرشيف أثناء تثبيت التطبيق",
     "App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
-    "App cannot be installed because appinfo file cannot be read." : "لا يمكن تثبيت التطبيق لأن ملف appinfo غير ممكنة قراءته.",
-    "Signature could not get checked. Please contact the app developer and check your admin screen." : "لم يتم التحقق من التوقيع.  فضلاً اتصل بمطوّر التطبيق و تحقق من شاشة الإدارة في حسابك.",
-    "App can't be installed because of not allowed code in the App" : "لم يتم تثبيت التطبيق لوجود شفرة غير مسموح بها في التطبيق",
-    "App can't be installed because it is not compatible with this version of ownCloud" : "لم يتم تثبيت التطبيق لأنه غير متوافق مع هذا الإصدار من ownCloud",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "لم يتم تثبيت التطبيق لأن به علامة <shipped>true</shipped> التي لايسمح بها في التطبيقات غير المشحونة",
-    "App can't be installed because the version in info.xml is not the same as the version reported from the app store" : "لم يتم تثبيت التطبيق لأن الإصدار في info.xml مختلف عن الإصدار المذكور في متجر التطبيقات",
-    "%s enter the database username and name." : "%s أدخِل اسم قاعدة البيانات واسم مستخدمها.",
     "%s enter the database username." : "%s ادخل اسم المستخدم الخاص بقاعدة البيانات.",
     "%s enter the database name." : "%s ادخل اسم فاعدة البيانات",
     "%s you may not use dots in the database name" : "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
@@ -49,20 +21,9 @@
     "You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
     "Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
     "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
-    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "نظام ماك الإصدار X غير مدعوم و %s لن يعمل بشكل صحيح على هذه المنصة.  استخدمه على مسؤوليتك!",
-    "For the best results, please consider using a GNU/Linux server instead." : "فضلاً ضع في الاعتبار استخدام نظام GNU/Linux بدل الأنظمة الأخرى للحصول على أفضل النتائج.",
-    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "فضلاً إحذف إعداد open_basedir من ملف php.ini لديك أو حوّل إلى PHP إصدار 64 بت.",
     "Set an admin username." : "اعداد اسم مستخدم للمدير",
     "Set an admin password." : "اعداد كلمة مرور للمدير",
-    "Can't create or write into the data directory %s" : "لا يمكن الإنشاء أو الكتابة في مجلد البيانات %s",
-    "Invalid Federated Cloud ID" : "معرّف سحابة الاتحاد غير صالح",
     "%s shared »%s« with you" : "%s شارك »%s« معك",
-    "%s via %s" : "%s عبر %s",
-    "Sharing %s failed, because the file does not exist" : "فشلت مشاركة %s فالملف غير موجود",
-    "You are not allowed to share %s" : "أنت غير مسموح لك أن تشارك %s",
-    "Sharing %s failed, because you can not share with yourself" : "فشلت مشاركة %s لأنك لايمكنك المشاركة مع نفسك",
-    "Sharing %s failed, because the user %s does not exist" : "فشلت مشاركة %s لأن المستخدم %s غير موجود",
-    "Share type %s is not valid for %s" : "مشاركة النوع %s غير صالحة لـ %s",
     "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
     "Apps" : "التطبيقات",
     "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index de13cd796d6..5c5b7844cf7 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu id-ul %s nu există. Activează-l în setările tale de aplicație sau contactează-ți administratorul.",
     "Empty filename is not allowed" : "Nu este permis fișier fără nume",
     "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise",
-    "4-byte characters are not supported in file names" : "Caracterele stocate în 4 octeți nu sunt suportate în denumirile fișierelor",
     "File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
     "File name contains at least one invalid character" : "Numele fișierului conține măcar un caracter invalid",
     "File name is too long" : "Numele fișierului este prea lung",
@@ -37,8 +36,6 @@ OC.L10N.register(
     "Can't create app folder. Please fix permissions. %s" : "Nu se poate crea directorul de aplicație. Repară permisiunile. %s",
     "Archive does not contain a directory named %s" : "Arhiva nu conține vreun director cu numele %s",
     "No source specified when installing app" : "Nu a fost specificată vreo sursă la instalarea aplicației",
-    "No href specified when installing app from http" : "Nu s-a specificat adresa la instalarea aplicației dintr-o sursă de pe Internet",
-    "No path specified when installing app from local file" : "Nu s-a specificat vreo cale la instalarea aplicației de pe un fișier local",
     "Archives of type %s are not supported" : "Arhivele de tip %s nu sunt suportate",
     "Failed to open archive when installing app" : "Deschiderea arhivei a eșuat în timpul instalării aplicației",
     "App does not provide an info.xml file" : "Aplicația nu furnizează un fișier info.xml",
@@ -54,12 +51,10 @@ OC.L10N.register(
     "DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
     "Offending command was: \"%s\"" : "Comanda cauză a fost: \"%s\"",
     "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
-    "For the best results, please consider using a GNU/Linux server instead." : "Pentru cele mai bune rezultate, ia în calcul folosirea unui server care rulează un sistem de operare GNU/Linux.",
     "Set an admin username." : "Setează un nume de administrator.",
     "Set an admin password." : "Setează o parolă de administrator.",
     "Invalid Federated Cloud ID" : "ID invalid cloud federalizat",
     "%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
-    "%s via %s" : "%s via %s",
     "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s",
     "Not allowed to create a federated share with the same user" : "Nu este permisă crearea unei partajări federalizate cu acelaşi utilizator",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 9149650a015..566f6d01123 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -27,7 +27,6 @@
     "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modulul cu id-ul %s nu există. Activează-l în setările tale de aplicație sau contactează-ți administratorul.",
     "Empty filename is not allowed" : "Nu este permis fișier fără nume",
     "Dot files are not allowed" : "Fișierele care încep cu caracterul punct nu sunt permise",
-    "4-byte characters are not supported in file names" : "Caracterele stocate în 4 octeți nu sunt suportate în denumirile fișierelor",
     "File name is a reserved word" : "Numele fișierului este un cuvânt rezervat",
     "File name contains at least one invalid character" : "Numele fișierului conține măcar un caracter invalid",
     "File name is too long" : "Numele fișierului este prea lung",
@@ -35,8 +34,6 @@
     "Can't create app folder. Please fix permissions. %s" : "Nu se poate crea directorul de aplicație. Repară permisiunile. %s",
     "Archive does not contain a directory named %s" : "Arhiva nu conține vreun director cu numele %s",
     "No source specified when installing app" : "Nu a fost specificată vreo sursă la instalarea aplicației",
-    "No href specified when installing app from http" : "Nu s-a specificat adresa la instalarea aplicației dintr-o sursă de pe Internet",
-    "No path specified when installing app from local file" : "Nu s-a specificat vreo cale la instalarea aplicației de pe un fișier local",
     "Archives of type %s are not supported" : "Arhivele de tip %s nu sunt suportate",
     "Failed to open archive when installing app" : "Deschiderea arhivei a eșuat în timpul instalării aplicației",
     "App does not provide an info.xml file" : "Aplicația nu furnizează un fișier info.xml",
@@ -52,12 +49,10 @@
     "DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
     "Offending command was: \"%s\"" : "Comanda cauză a fost: \"%s\"",
     "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
-    "For the best results, please consider using a GNU/Linux server instead." : "Pentru cele mai bune rezultate, ia în calcul folosirea unui server care rulează un sistem de operare GNU/Linux.",
     "Set an admin username." : "Setează un nume de administrator.",
     "Set an admin password." : "Setează o parolă de administrator.",
     "Invalid Federated Cloud ID" : "ID invalid cloud federalizat",
     "%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
-    "%s via %s" : "%s via %s",
     "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Sharing %s failed, because this item is already shared with %s" : "Partajarea %s a eșuat deoarece acest element este deja partajat cu %s",
     "Not allowed to create a federated share with the same user" : "Nu este permisă crearea unei partajări federalizate cu acelaşi utilizator",
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
index e082cea3305..6e99e1ac268 100644
--- a/lib/private/AllConfig.php
+++ b/lib/private/AllConfig.php
@@ -154,7 +154,7 @@ class AllConfig implements \OCP\IConfig {
 	 *
 	 * @param string $appName the appName that we want to store the value under
 	 * @param string $key the key of the value, under which will be saved
-	 * @param string|float|int $value the value that should be stored
+	 * @param string $value the value that should be stored
 	 */
 	public function setAppValue($appName, $key, $value) {
 		\OC::$server->getAppConfig()->setValue($appName, $key, $value);
@@ -198,16 +198,11 @@ class AllConfig implements \OCP\IConfig {
 	 * @param string $userId the userId of the user that we want to store the value under
 	 * @param string $appName the appName that we want to store the value under
 	 * @param string $key the key under which the value is being stored
-	 * @param string|float|int $value the value that you want to store
+	 * @param string $value the value that you want to store
 	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
 	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
 	 */
 	public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
-		if (!is_int($value) && !is_float($value) && !is_string($value)) {
-			throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
-		}
-
 		// TODO - FIXME
 		$this->fixDIInit();
 
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index f84c8a41f17..24542152ffc 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -143,7 +143,7 @@ class AppConfig implements IAppConfig {
 	 *
 	 * @param string $app app
 	 * @param string $key key
-	 * @param string|float|int $value value
+	 * @param string $value value
 	 * @return bool True if the value was inserted or updated, false if the value was the same
 	 */
 	public function setValue($app, $key, $value) {
diff --git a/lib/private/Authentication/Token/DefaultTokenCleanupJob.php b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
index 7746d6be915..04b98c6c5a0 100644
--- a/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
+++ b/lib/private/Authentication/Token/DefaultTokenCleanupJob.php
@@ -28,7 +28,6 @@ class DefaultTokenCleanupJob extends Job {
 
 	protected function run($argument) {
 		/* @var $provider DefaultTokenProvider */
-		// TODO: add OC\Authentication\Token\IProvider::invalidateOldTokens and query interface
 		$provider = OC::$server->query('OC\Authentication\Token\DefaultTokenProvider');
 		$provider->invalidateOldTokens();
 	}
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
index 34a3e1bff91..8676bc09575 100644
--- a/lib/private/Encryption/DecryptAll.php
+++ b/lib/private/Encryption/DecryptAll.php
@@ -80,7 +80,7 @@ class DecryptAll {
 		$this->input = $input;
 		$this->output = $output;
 
-		if ($user !== '' && $this->userManager->userExists($user) === false) {
+		if (!empty($user) && $this->userManager->userExists($user) === false) {
 			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
 			return false;
 		}
@@ -141,7 +141,7 @@ class DecryptAll {
 		$this->output->writeln("\n");
 
 		$userList = [];
-		if ($user === '') {
+		if (empty($user)) {
 
 			$fetchUsersProgress = new ProgressBar($this->output);
 			$fetchUsersProgress->setFormat(" %message% \n [%bar%]");
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index c17f9bfd51b..e6bd118d5a5 100644
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -38,7 +38,6 @@ use OC\Files\Filesystem;
 use OC\Hooks\BasicEmitter;
 use OCP\Config;
 use OCP\Files\Cache\IScanner;
-use OCP\Files\ForbiddenException;
 use OCP\Files\Storage\ILockingStorage;
 use OCP\Lock\ILockingProvider;
 
@@ -141,11 +140,7 @@ class Scanner extends BasicEmitter implements IScanner {
 				}
 			}
 
-			try {
-				$data = $this->getData($file);
-			} catch (ForbiddenException $e) {
-				return null;
-			}
+			$data = $this->getData($file);
 
 			if ($data) {
 
diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php
index 4e17c4d778d..820941abae1 100644
--- a/lib/private/Files/Cache/Updater.php
+++ b/lib/private/Files/Cache/Updater.php
@@ -231,10 +231,7 @@ class Updater implements IUpdater {
 		$parentId = $this->cache->getParentId($internalPath);
 		$parent = dirname($internalPath);
 		if ($parentId != -1) {
-			$mtime = $this->storage->filemtime($parent);
-			if ($mtime !== false) {
-				$this->cache->update($parentId, array('storage_mtime' => $mtime));
-			}
+			$this->cache->update($parentId, array('storage_mtime' => $this->storage->filemtime($parent)));
 		}
 	}
 }
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 0c1b69108d4..cec6a42a2c0 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -643,9 +643,6 @@ abstract class Common implements Storage, ILockingStorage {
 		$data = [];
 		$data['mimetype'] = $this->getMimeType($path);
 		$data['mtime'] = $this->filemtime($path);
-		if ($data['mtime'] === false) {
-			$data['mtime'] = time();
-		}
 		if ($data['mimetype'] == 'httpd/unix-directory') {
 			$data['size'] = -1; //unknown
 		} else {
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 005b5f9ab91..b07e26a3358 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -33,31 +33,20 @@
  */
 
 namespace OC\Files\Storage;
-
-use OCP\Files\ForbiddenException;
-
 /**
  * for local filestore, we only have to map the paths
  */
 class Local extends \OC\Files\Storage\Common {
 	protected $datadir;
 
-	protected $dataDirLength;
-
-	protected $allowSymlinks = false;
-
-	protected $realDataDir;
-
 	public function __construct($arguments) {
 		if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
 			throw new \InvalidArgumentException('No data directory set for local storage');
 		}
 		$this->datadir = $arguments['datadir'];
-		$this->realDataDir = rtrim(realpath($this->datadir), '/') . '/';
 		if (substr($this->datadir, -1) !== '/') {
 			$this->datadir .= '/';
 		}
-		$this->dataDirLength = strlen($this->realDataDir);
 	}
 
 	public function __destruct() {
@@ -168,7 +157,7 @@ class Local extends \OC\Files\Storage\Common {
 
 	public function filemtime($path) {
 		clearstatcache($this->getSourcePath($path));
-		return $this->file_exists($path) ? filemtime($this->getSourcePath($path)) : false;
+		return filemtime($this->getSourcePath($path));
 	}
 
 	public function touch($path, $mtime = null) {
@@ -199,7 +188,7 @@ class Local extends \OC\Files\Storage\Common {
 			return '';
 		}
 
-		$handle = fopen($fileName, 'rb');
+		$handle = fopen($fileName,'rb');
 		$content = fread($handle, $fileSize);
 		fclose($handle);
 		return $content;
@@ -348,27 +337,10 @@ class Local extends \OC\Files\Storage\Common {
 	 *
 	 * @param string $path
 	 * @return string
-	 * @throws ForbiddenException
 	 */
 	public function getSourcePath($path) {
 		$fullPath = $this->datadir . $path;
-		if ($this->allowSymlinks || $path === '') {
-			return $fullPath;
-		}
-		$pathToResolve = $fullPath;
-		$realPath = realpath($pathToResolve);
-		while ($realPath === false) { // for non existing files check the parent directory
-			$pathToResolve = dirname($pathToResolve);
-			$realPath = realpath($pathToResolve);
-		}
-		if ($realPath) {
-			$realPath = $realPath . '/';
-		}
-		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
-			return $fullPath;
-		} else {
-			throw new ForbiddenException("Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", false);
-		}
+		return $fullPath;
 	}
 
 	/**
@@ -405,7 +377,7 @@ class Local extends \OC\Files\Storage\Common {
 	 * @return bool
 	 */
 	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) {
+		if($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')){
 			/**
 			 * @var \OC\Files\Storage\Local $sourceStorage
 			 */
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index e9daa123470..f738542ea8c 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -337,17 +337,10 @@ class View {
 			return $this->removeMount($mount, $absolutePath);
 		}
 		if ($this->is_dir($path)) {
-			$result = $this->basicOperation('rmdir', $path, array('delete'));
+			return $this->basicOperation('rmdir', $path, array('delete'));
 		} else {
-			$result = false;
-		}
-
-		if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absolutePath);
-			$storage->getUpdater()->remove($internalPath);
+			return false;
 		}
-		return $result;
 	}
 
 	/**
@@ -436,7 +429,7 @@ class View {
 
 	/**
 	 * @param string $path
-	 * @param int $from
+	 * @param int $from 
 	 * @param int $to
 	 * @return bool|mixed
 	 * @throws \OCP\Files\InvalidPathException
@@ -448,18 +441,18 @@ class View {
 		$handle = $this->fopen($path, 'rb');
 		if ($handle) {
 			if (fseek($handle, $from) === 0) {
-				$chunkSize = 8192; // 8 kB chunks
-				$end = $to + 1;
-				while (!feof($handle) && ftell($handle) < $end) {
-					$len = $end - ftell($handle);
-					if ($len > $chunkSize) {
-						$len = $chunkSize;
-					}
-					echo fread($handle, $len);
-					flush();
+			    $chunkSize = 8192; // 8 kB chunks
+			    $end = $to + 1;
+			    while (!feof($handle) && ftell($handle) < $end) {
+				$len = $end-ftell($handle);
+				if ($len > $chunkSize) { 
+				    $len = $chunkSize; 
 				}
-				$size = ftell($handle) - $from;
-				return $size;
+				echo fread($handle, $len);
+				flush();
+			    }
+			    $size = ftell($handle) - $from;
+			    return $size;
 			}
 
 			throw new \OCP\Files\UnseekableException('fseek error');
@@ -686,15 +679,7 @@ class View {
 		if ($mount and $mount->getInternalPath($absolutePath) === '') {
 			return $this->removeMount($mount, $absolutePath);
 		}
-		$result = $this->basicOperation('unlink', $path, array('delete'));
-		if (!$result && !$this->file_exists($path)) { //clear ghost files from the cache on delete
-			$storage = $mount->getStorage();
-			$internalPath = $mount->getInternalPath($absolutePath);
-			$storage->getUpdater()->remove($internalPath);
-			return true;
-		} else {
-			return $result;
-		}
+		return $this->basicOperation('unlink', $path, array('delete'));
 	}
 
 	/**
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index 21fb3cbc5ab..f107d47faf7 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -206,9 +206,7 @@ class OC_Helper {
 
 			foreach ($files as $fileInfo) {
 				/** @var SplFileInfo $fileInfo */
-				if ($fileInfo->isLink()) {
-					unlink($fileInfo->getPathname());
-				} else if ($fileInfo->isDir()) {
+				if ($fileInfo->isDir()) {
 					rmdir($fileInfo->getRealPath());
 				} else {
 					unlink($fileInfo->getRealPath());
diff --git a/lib/public/IAppConfig.php b/lib/public/IAppConfig.php
index 22fcdbbb205..1406e8a56d6 100644
--- a/lib/public/IAppConfig.php
+++ b/lib/public/IAppConfig.php
@@ -88,7 +88,7 @@ interface IAppConfig {
 	 * sets a value in the appconfig
 	 * @param string $app app
 	 * @param string $key key
-	 * @param string|float|int $value value
+	 * @param string $value value
 	 * @deprecated 8.0.0 use method setAppValue of \OCP\IConfig
 	 *
 	 * Sets a value. If the key did not exist before it will be created.
diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php
index 05158e9063e..9e5024545b3 100644
--- a/lib/public/IConfig.php
+++ b/lib/public/IConfig.php
@@ -104,7 +104,7 @@ interface IConfig {
 	 * Writes a new app wide value
 	 *
 	 * @param string $appName the appName that we want to store the value under
-	 * @param string|float|int $key the key of the value, under which will be saved
+	 * @param string $key the key of the value, under which will be saved
 	 * @param string $value the value that should be stored
 	 * @return void
 	 * @since 6.0.0
@@ -149,7 +149,6 @@ interface IConfig {
 	 * @param string $value the value that you want to store
 	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
 	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
 	 * @since 6.0.0 - parameter $precondition was added in 8.0.0
 	 */
 	public function setUserValue($userId, $appName, $key, $value, $preCondition = null);