move the private namespace OC into lib/private - OCP will stay in lib/public

Conflicts:
	lib/private/vcategories.php

309 files changed, 5 insertions, 5 deletions

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 01841f831be..72041200116 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -73,10 +73,10 @@ class Autoloader {
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
 			// first check for legacy classes if underscores are used
-			$paths[] = 'legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-			$paths[] = strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
 		} elseif (strpos($class, 'OC\\') === 0) {
-			$paths[] = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/' . strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
 		} elseif (strpos($class, 'OCP\\') === 0) {
 			$paths[] = 'public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
diff --git a/lib/base.php b/lib/base.php
index 58894be03ee..7e237c35d27 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -164,7 +164,7 @@ class OC {
 
 		// set the right include path
 		set_include_path(
-			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+			OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR .
 			OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
 			OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
 			implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
diff --git a/lib/allconfig.php b/lib/private/allconfig.php
index 72aabf60793..72aabf60793 100644
--- a/lib/allconfig.php
+++ b/lib/private/allconfig.php
diff --git a/lib/api.php b/lib/private/api.php
index 31f3f968d9b..31f3f968d9b 100644
--- a/lib/api.php
+++ b/lib/private/api.php
diff --git a/lib/app.php b/lib/private/app.php
index 0ab1ee57f63..0ab1ee57f63 100644
--- a/lib/app.php
+++ b/lib/private/app.php
diff --git a/lib/appconfig.php b/lib/private/appconfig.php
index e615d838173..e615d838173 100644
--- a/lib/appconfig.php
+++ b/lib/private/appconfig.php
diff --git a/lib/appframework/app.php b/lib/private/appframework/app.php
index 7ff55bb809d..7ff55bb809d 100644
--- a/lib/appframework/app.php
+++ b/lib/private/appframework/app.php
diff --git a/lib/appframework/controller/controller.php b/lib/private/appframework/controller/controller.php
index 0ea0a38cc09..0ea0a38cc09 100644
--- a/lib/appframework/controller/controller.php
+++ b/lib/private/appframework/controller/controller.php
diff --git a/lib/appframework/core/api.php b/lib/private/appframework/core/api.php
index 39522ee3dd5..39522ee3dd5 100644
--- a/lib/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 3755d45fa09..3755d45fa09 100644
--- a/lib/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
diff --git a/lib/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index ea57a6860cc..ea57a6860cc 100644
--- a/lib/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
diff --git a/lib/appframework/http/downloadresponse.php b/lib/private/appframework/http/downloadresponse.php
index 67b9542dba6..67b9542dba6 100644
--- a/lib/appframework/http/downloadresponse.php
+++ b/lib/private/appframework/http/downloadresponse.php
diff --git a/lib/appframework/http/http.php b/lib/private/appframework/http/http.php
index e00dc9cdc4a..e00dc9cdc4a 100644
--- a/lib/appframework/http/http.php
+++ b/lib/private/appframework/http/http.php
diff --git a/lib/appframework/http/redirectresponse.php b/lib/private/appframework/http/redirectresponse.php
index 688447f1618..688447f1618 100644
--- a/lib/appframework/http/redirectresponse.php
+++ b/lib/private/appframework/http/redirectresponse.php
diff --git a/lib/appframework/http/request.php b/lib/private/appframework/http/request.php
index 34605acdfea..34605acdfea 100644
--- a/lib/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
diff --git a/lib/appframework/middleware/middleware.php b/lib/private/appframework/middleware/middleware.php
index b12c03c3eb8..b12c03c3eb8 100644
--- a/lib/appframework/middleware/middleware.php
+++ b/lib/private/appframework/middleware/middleware.php
diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index 70ab108e6b8..70ab108e6b8 100644
--- a/lib/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
diff --git a/lib/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php
index b32a2769ff5..b32a2769ff5 100644
--- a/lib/appframework/middleware/security/securityexception.php
+++ b/lib/private/appframework/middleware/security/securityexception.php
diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index 4f1447e1afb..4f1447e1afb 100644
--- a/lib/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
diff --git a/lib/appframework/routing/routeactionhandler.php b/lib/private/appframework/routing/routeactionhandler.php
index 7fb56f14eab..7fb56f14eab 100644
--- a/lib/appframework/routing/routeactionhandler.php
+++ b/lib/private/appframework/routing/routeactionhandler.php
diff --git a/lib/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index 53ab11bf2f5..53ab11bf2f5 100644
--- a/lib/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
diff --git a/lib/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/methodannotationreader.php
index 42060a08529..42060a08529 100644
--- a/lib/appframework/utility/methodannotationreader.php
+++ b/lib/private/appframework/utility/methodannotationreader.php
diff --git a/lib/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index a51ace83a37..7e4db63bde5 100644
--- a/lib/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -3,7 +3,7 @@
 namespace OC\AppFramework\Utility;
 
 // register 3rdparty autoloaders
-require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
+require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php';
 
 /**
  * Class SimpleContainer
diff --git a/lib/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php
index 2c3dd6cf5e3..2c3dd6cf5e3 100644
--- a/lib/appframework/utility/timefactory.php
+++ b/lib/private/appframework/utility/timefactory.php
diff --git a/lib/archive.php b/lib/private/archive.php
index 85bfae57295..85bfae57295 100644
--- a/lib/archive.php
+++ b/lib/private/archive.php
diff --git a/lib/archive/tar.php b/lib/private/archive/tar.php
index a1c0535b1c3..a1c0535b1c3 100644
--- a/lib/archive/tar.php
+++ b/lib/private/archive/tar.php
diff --git a/lib/archive/zip.php b/lib/private/archive/zip.php
index 8a866716a79..8a866716a79 100644
--- a/lib/archive/zip.php
+++ b/lib/private/archive/zip.php
diff --git a/lib/arrayparser.php b/lib/private/arrayparser.php
index 3bb394a5163..3bb394a5163 100644
--- a/lib/arrayparser.php
+++ b/lib/private/arrayparser.php
diff --git a/lib/avatar.php b/lib/private/avatar.php
index f20980c364b..f20980c364b 100644
--- a/lib/avatar.php
+++ b/lib/private/avatar.php
diff --git a/lib/backgroundjob.php b/lib/private/backgroundjob.php
index 9619dcb732c..9619dcb732c 100644
--- a/lib/backgroundjob.php
+++ b/lib/private/backgroundjob.php
diff --git a/lib/backgroundjob/job.php b/lib/private/backgroundjob/job.php
index 49fbffbd684..49fbffbd684 100644
--- a/lib/backgroundjob/job.php
+++ b/lib/private/backgroundjob/job.php
diff --git a/lib/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index cc803dd9b5f..cc803dd9b5f 100644
--- a/lib/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/private/backgroundjob/legacy/queuedjob.php
index 2bc001103b8..2bc001103b8 100644
--- a/lib/backgroundjob/legacy/queuedjob.php
+++ b/lib/private/backgroundjob/legacy/queuedjob.php
diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/private/backgroundjob/legacy/regularjob.php
index d4cfa348cea..d4cfa348cea 100644
--- a/lib/backgroundjob/legacy/regularjob.php
+++ b/lib/private/backgroundjob/legacy/regularjob.php
diff --git a/lib/backgroundjob/queuedjob.php b/lib/private/backgroundjob/queuedjob.php
index 1714182820d..1714182820d 100644
--- a/lib/backgroundjob/queuedjob.php
+++ b/lib/private/backgroundjob/queuedjob.php
diff --git a/lib/backgroundjob/timedjob.php b/lib/private/backgroundjob/timedjob.php
index ae9f33505ab..ae9f33505ab 100644
--- a/lib/backgroundjob/timedjob.php
+++ b/lib/private/backgroundjob/timedjob.php
diff --git a/lib/cache.php b/lib/private/cache.php
index a311f10a00f..a311f10a00f 100644
--- a/lib/cache.php
+++ b/lib/private/cache.php
diff --git a/lib/cache/broker.php b/lib/private/cache/broker.php
index 9b7e837e1bc..9b7e837e1bc 100644
--- a/lib/cache/broker.php
+++ b/lib/private/cache/broker.php
diff --git a/lib/cache/file.php b/lib/private/cache/file.php
index 2ab914d17b8..2ab914d17b8 100644
--- a/lib/cache/file.php
+++ b/lib/private/cache/file.php
diff --git a/lib/cache/fileglobal.php b/lib/private/cache/fileglobal.php
index bd049bba4d0..bd049bba4d0 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/private/cache/fileglobal.php
diff --git a/lib/cache/fileglobalgc.php b/lib/private/cache/fileglobalgc.php
index 399dd5e6f94..399dd5e6f94 100644
--- a/lib/cache/fileglobalgc.php
+++ b/lib/private/cache/fileglobalgc.php
diff --git a/lib/cache/usercache.php b/lib/private/cache/usercache.php
index baa8820700b..baa8820700b 100644
--- a/lib/cache/usercache.php
+++ b/lib/private/cache/usercache.php
diff --git a/lib/config.php b/lib/private/config.php
index e773e6e2eb0..e773e6e2eb0 100644
--- a/lib/config.php
+++ b/lib/private/config.php
diff --git a/lib/connector/sabre/ServiceUnavailable.php b/lib/private/connector/sabre/ServiceUnavailable.php
index c1cc815c989..c1cc815c989 100644
--- a/lib/connector/sabre/ServiceUnavailable.php
+++ b/lib/private/connector/sabre/ServiceUnavailable.php
diff --git a/lib/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index bf3a49593cb..bf3a49593cb 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
diff --git a/lib/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 382bdf06df1..382bdf06df1 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
diff --git a/lib/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 433b1148552..433b1148552 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
diff --git a/lib/connector/sabre/locks.php b/lib/private/connector/sabre/locks.php
index 69496c15ada..69496c15ada 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/private/connector/sabre/locks.php
diff --git a/lib/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index 2eda269afc2..2eda269afc2 100644
--- a/lib/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
diff --git a/lib/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 29b7f9e53a5..29b7f9e53a5 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
diff --git a/lib/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index 80c3840b99d..80c3840b99d 100644
--- a/lib/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
diff --git a/lib/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
index 59a96797c16..59a96797c16 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/private/connector/sabre/principal.php
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index ea2cb81d1f7..ea2cb81d1f7 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
diff --git a/lib/connector/sabre/request.php b/lib/private/connector/sabre/request.php
index d70c25c4e70..d70c25c4e70 100644
--- a/lib/connector/sabre/request.php
+++ b/lib/private/connector/sabre/request.php
diff --git a/lib/contactsmanager.php b/lib/private/contactsmanager.php
index fc6745b4505..fc6745b4505 100644
--- a/lib/contactsmanager.php
+++ b/lib/private/contactsmanager.php
diff --git a/lib/db.php b/lib/private/db.php
index 1e5d12649df..1e5d12649df 100644
--- a/lib/db.php
+++ b/lib/private/db.php
diff --git a/lib/db/adapter.php b/lib/private/db/adapter.php
index 6b31f37dd98..6b31f37dd98 100644
--- a/lib/db/adapter.php
+++ b/lib/private/db/adapter.php
diff --git a/lib/db/adapteroci8.php b/lib/private/db/adapteroci8.php
index bc226e979ec..bc226e979ec 100644
--- a/lib/db/adapteroci8.php
+++ b/lib/private/db/adapteroci8.php
diff --git a/lib/db/adapterpgsql.php b/lib/private/db/adapterpgsql.php
index 990d71c9f29..990d71c9f29 100644
--- a/lib/db/adapterpgsql.php
+++ b/lib/private/db/adapterpgsql.php
diff --git a/lib/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index fa6d308ae32..fa6d308ae32 100644
--- a/lib/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
diff --git a/lib/db/adaptersqlsrv.php b/lib/private/db/adaptersqlsrv.php
index d0a67af28a7..d0a67af28a7 100644
--- a/lib/db/adaptersqlsrv.php
+++ b/lib/private/db/adaptersqlsrv.php
diff --git a/lib/db/connection.php b/lib/private/db/connection.php
index 2d3193a148a..2d3193a148a 100644
--- a/lib/db/connection.php
+++ b/lib/private/db/connection.php
diff --git a/lib/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 8e76f46c78f..8e76f46c78f 100644
--- a/lib/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
diff --git a/lib/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index b7128a2f176..b7128a2f176 100644
--- a/lib/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
diff --git a/lib/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php
index 21b43cbfe80..21b43cbfe80 100644
--- a/lib/db/mdb2schemawriter.php
+++ b/lib/private/db/mdb2schemawriter.php
diff --git a/lib/db/oracleconnection.php b/lib/private/db/oracleconnection.php
index e2fc4644f47..e2fc4644f47 100644
--- a/lib/db/oracleconnection.php
+++ b/lib/private/db/oracleconnection.php
diff --git a/lib/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index b8da1afc0e5..b8da1afc0e5 100644
--- a/lib/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
diff --git a/lib/defaults.php b/lib/private/defaults.php
index 10813a3e8d8..10813a3e8d8 100644
--- a/lib/defaults.php
+++ b/lib/private/defaults.php
diff --git a/lib/eventsource.php b/lib/private/eventsource.php
index a83084d9251..a83084d9251 100644
--- a/lib/eventsource.php
+++ b/lib/private/eventsource.php
diff --git a/lib/filechunking.php b/lib/private/filechunking.php
index 313a6ee87d2..313a6ee87d2 100644
--- a/lib/filechunking.php
+++ b/lib/private/filechunking.php
diff --git a/lib/fileproxy.php b/lib/private/fileproxy.php
index 52ec79b4bdb..52ec79b4bdb 100644
--- a/lib/fileproxy.php
+++ b/lib/private/fileproxy.php
diff --git a/lib/fileproxy/fileoperations.php b/lib/private/fileproxy/fileoperations.php
index b2ff2e7e5e9..b2ff2e7e5e9 100644
--- a/lib/fileproxy/fileoperations.php
+++ b/lib/private/fileproxy/fileoperations.php
diff --git a/lib/files.php b/lib/private/files.php
index c705d2adb1a..c705d2adb1a 100644
--- a/lib/files.php
+++ b/lib/private/files.php
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/private/files/cache/backgroundwatcher.php
index 923804f48d0..923804f48d0 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/private/files/cache/backgroundwatcher.php
diff --git a/lib/files/cache/cache.php b/lib/private/files/cache/cache.php
index e69733727af..e69733727af 100644
--- a/lib/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
diff --git a/lib/files/cache/legacy.php b/lib/private/files/cache/legacy.php
index 8eed1f67a5d..8eed1f67a5d 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/private/files/cache/legacy.php
diff --git a/lib/files/cache/permissions.php b/lib/private/files/cache/permissions.php
index 2e2bdb20b78..2e2bdb20b78 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/private/files/cache/permissions.php
diff --git a/lib/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 96f84609cf2..96f84609cf2 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
diff --git a/lib/files/cache/storage.php b/lib/private/files/cache/storage.php
index 8a9e47ca36d..8a9e47ca36d 100644
--- a/lib/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
diff --git a/lib/files/cache/updater.php b/lib/private/files/cache/updater.php
index 1f30173a8f8..1f30173a8f8 100644
--- a/lib/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
diff --git a/lib/files/cache/upgrade.php b/lib/private/files/cache/upgrade.php
index cfb9a117311..cfb9a117311 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/private/files/cache/upgrade.php
diff --git a/lib/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 8bfd4602f3a..8bfd4602f3a 100644
--- a/lib/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
diff --git a/lib/files/filesystem.php b/lib/private/files/filesystem.php
index 10ec5c41d11..10ec5c41d11 100644
--- a/lib/files/filesystem.php
+++ b/lib/private/files/filesystem.php
diff --git a/lib/files/mapper.php b/lib/private/files/mapper.php
index 47abd4e52fe..47abd4e52fe 100644
--- a/lib/files/mapper.php
+++ b/lib/private/files/mapper.php
diff --git a/lib/files/mount/manager.php b/lib/private/files/mount/manager.php
index 4c432dcf724..4c432dcf724 100644
--- a/lib/files/mount/manager.php
+++ b/lib/private/files/mount/manager.php
diff --git a/lib/files/mount/mount.php b/lib/private/files/mount/mount.php
index 0ce2f5975c7..0ce2f5975c7 100644
--- a/lib/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
diff --git a/lib/files/node/file.php b/lib/private/files/node/file.php
index 75d5e0166b6..75d5e0166b6 100644
--- a/lib/files/node/file.php
+++ b/lib/private/files/node/file.php
diff --git a/lib/files/node/folder.php b/lib/private/files/node/folder.php
index 923f53821b2..923f53821b2 100644
--- a/lib/files/node/folder.php
+++ b/lib/private/files/node/folder.php
diff --git a/lib/files/node/node.php b/lib/private/files/node/node.php
index 063e2424a64..063e2424a64 100644
--- a/lib/files/node/node.php
+++ b/lib/private/files/node/node.php
diff --git a/lib/files/node/nonexistingfile.php b/lib/private/files/node/nonexistingfile.php
index d45076f7fee..d45076f7fee 100644
--- a/lib/files/node/nonexistingfile.php
+++ b/lib/private/files/node/nonexistingfile.php
diff --git a/lib/files/node/nonexistingfolder.php b/lib/private/files/node/nonexistingfolder.php
index 0346cbf1e21..0346cbf1e21 100644
--- a/lib/files/node/nonexistingfolder.php
+++ b/lib/private/files/node/nonexistingfolder.php
diff --git a/lib/files/node/root.php b/lib/private/files/node/root.php
index e3d58476e9c..e3d58476e9c 100644
--- a/lib/files/node/root.php
+++ b/lib/private/files/node/root.php
diff --git a/lib/files/storage/common.php b/lib/private/files/storage/common.php
index a5b79f0e967..a5b79f0e967 100644
--- a/lib/files/storage/common.php
+++ b/lib/private/files/storage/common.php
diff --git a/lib/files/storage/commontest.php b/lib/private/files/storage/commontest.php
index c3f1eb31955..c3f1eb31955 100644
--- a/lib/files/storage/commontest.php
+++ b/lib/private/files/storage/commontest.php
diff --git a/lib/files/storage/loader.php b/lib/private/files/storage/loader.php
index 2572ef443bc..2572ef443bc 100644
--- a/lib/files/storage/loader.php
+++ b/lib/private/files/storage/loader.php
diff --git a/lib/files/storage/local.php b/lib/private/files/storage/local.php
index 5209fabc30a..5209fabc30a 100644
--- a/lib/files/storage/local.php
+++ b/lib/private/files/storage/local.php
diff --git a/lib/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index ba5ac4191c5..ba5ac4191c5 100644
--- a/lib/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
diff --git a/lib/files/storage/storage.php b/lib/private/files/storage/storage.php
index b673bb9a32d..b673bb9a32d 100644
--- a/lib/files/storage/storage.php
+++ b/lib/private/files/storage/storage.php
diff --git a/lib/files/storage/temporary.php b/lib/private/files/storage/temporary.php
index d84dbda2e39..d84dbda2e39 100644
--- a/lib/files/storage/temporary.php
+++ b/lib/private/files/storage/temporary.php
diff --git a/lib/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index e2da8cf2e05..e2da8cf2e05 100644
--- a/lib/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index 0336c27efa1..0336c27efa1 100644
--- a/lib/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
diff --git a/lib/files/stream/close.php b/lib/private/files/stream/close.php
index 80de3497c36..80de3497c36 100644
--- a/lib/files/stream/close.php
+++ b/lib/private/files/stream/close.php
diff --git a/lib/files/stream/dir.php b/lib/private/files/stream/dir.php
index 6ca884fc994..6ca884fc994 100644
--- a/lib/files/stream/dir.php
+++ b/lib/private/files/stream/dir.php
diff --git a/lib/files/stream/oc.php b/lib/private/files/stream/oc.php
index 88e7e062df9..88e7e062df9 100644
--- a/lib/files/stream/oc.php
+++ b/lib/private/files/stream/oc.php
diff --git a/lib/files/stream/quota.php b/lib/private/files/stream/quota.php
index 53d8a03d30f..53d8a03d30f 100644
--- a/lib/files/stream/quota.php
+++ b/lib/private/files/stream/quota.php
diff --git a/lib/files/stream/staticstream.php b/lib/private/files/stream/staticstream.php
index 45b1a7a81f8..45b1a7a81f8 100644
--- a/lib/files/stream/staticstream.php
+++ b/lib/private/files/stream/staticstream.php
diff --git a/lib/files/type/detection.php b/lib/private/files/type/detection.php
index 242a81cb5a4..242a81cb5a4 100644
--- a/lib/files/type/detection.php
+++ b/lib/private/files/type/detection.php
diff --git a/lib/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
index cd1536d2732..cd1536d2732 100644
--- a/lib/files/type/templatemanager.php
+++ b/lib/private/files/type/templatemanager.php
diff --git a/lib/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 2cad7dd77bd..2cad7dd77bd 100644
--- a/lib/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
diff --git a/lib/files/view.php b/lib/private/files/view.php
index aa08a5f7cc9..aa08a5f7cc9 100644
--- a/lib/files/view.php
+++ b/lib/private/files/view.php
diff --git a/lib/geo.php b/lib/private/geo.php
index ed01ad0b616..ed01ad0b616 100644
--- a/lib/geo.php
+++ b/lib/private/geo.php
diff --git a/lib/group.php b/lib/private/group.php
index ba93dc129a1..ba93dc129a1 100644
--- a/lib/group.php
+++ b/lib/private/group.php
diff --git a/lib/group/backend.php b/lib/private/group/backend.php
index 2e17b5d0b7f..2e17b5d0b7f 100644
--- a/lib/group/backend.php
+++ b/lib/private/group/backend.php
diff --git a/lib/group/database.php b/lib/private/group/database.php
index d0974685ff6..d0974685ff6 100644
--- a/lib/group/database.php
+++ b/lib/private/group/database.php
diff --git a/lib/group/dummy.php b/lib/private/group/dummy.php
index 9516fd52ff8..9516fd52ff8 100644
--- a/lib/group/dummy.php
+++ b/lib/private/group/dummy.php
diff --git a/lib/group/example.php b/lib/private/group/example.php
index 3519b9ed92f..3519b9ed92f 100644
--- a/lib/group/example.php
+++ b/lib/private/group/example.php
diff --git a/lib/group/group.php b/lib/private/group/group.php
index bcd2419b309..bcd2419b309 100644
--- a/lib/group/group.php
+++ b/lib/private/group/group.php
diff --git a/lib/group/interface.php b/lib/private/group/interface.php
index 4ef3663837f..4ef3663837f 100644
--- a/lib/group/interface.php
+++ b/lib/private/group/interface.php
diff --git a/lib/group/manager.php b/lib/private/group/manager.php
index bf469d51d12..bf469d51d12 100644
--- a/lib/group/manager.php
+++ b/lib/private/group/manager.php
diff --git a/lib/helper.php b/lib/private/helper.php
index 66e7acb407a..66e7acb407a 100644
--- a/lib/helper.php
+++ b/lib/private/helper.php
diff --git a/lib/hintexception.php b/lib/private/hintexception.php
index 3934ae2a4c2..3934ae2a4c2 100644
--- a/lib/hintexception.php
+++ b/lib/private/hintexception.php
diff --git a/lib/hook.php b/lib/private/hook.php
index 8516cf0dcff..8516cf0dcff 100644
--- a/lib/hook.php
+++ b/lib/private/hook.php
diff --git a/lib/hooks/basicemitter.php b/lib/private/hooks/basicemitter.php
index 9ffe1af2314..9ffe1af2314 100644
--- a/lib/hooks/basicemitter.php
+++ b/lib/private/hooks/basicemitter.php
diff --git a/lib/hooks/emitter.php b/lib/private/hooks/emitter.php
index 8e9074bad67..8e9074bad67 100644
--- a/lib/hooks/emitter.php
+++ b/lib/private/hooks/emitter.php
diff --git a/lib/hooks/forwardingemitter.php b/lib/private/hooks/forwardingemitter.php
index 1aacc4012e0..1aacc4012e0 100644
--- a/lib/hooks/forwardingemitter.php
+++ b/lib/private/hooks/forwardingemitter.php
diff --git a/lib/hooks/legacyemitter.php b/lib/private/hooks/legacyemitter.php
index a2d16ace9a7..a2d16ace9a7 100644
--- a/lib/hooks/legacyemitter.php
+++ b/lib/private/hooks/legacyemitter.php
diff --git a/lib/hooks/publicemitter.php b/lib/private/hooks/publicemitter.php
index e2371713ac3..e2371713ac3 100644
--- a/lib/hooks/publicemitter.php
+++ b/lib/private/hooks/publicemitter.php
diff --git a/lib/image.php b/lib/private/image.php
index 7761a3c7737..7761a3c7737 100644
--- a/lib/image.php
+++ b/lib/private/image.php
diff --git a/lib/installer.php b/lib/private/installer.php
index e082c7eeee9..e082c7eeee9 100644
--- a/lib/installer.php
+++ b/lib/private/installer.php
diff --git a/lib/json.php b/lib/private/json.php
index 6ba0b13806b..6ba0b13806b 100644
--- a/lib/json.php
+++ b/lib/private/json.php
diff --git a/lib/l10n.php b/lib/private/l10n.php
index f93443b886a..f93443b886a 100644
--- a/lib/l10n.php
+++ b/lib/private/l10n.php
diff --git a/lib/l10n/ach.php b/lib/private/l10n/ach.php
index 406ff5f5a26..406ff5f5a26 100644
--- a/lib/l10n/ach.php
+++ b/lib/private/l10n/ach.php
diff --git a/lib/l10n/af_ZA.php b/lib/private/l10n/af_ZA.php
index d6bf5771e8d..d6bf5771e8d 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/private/l10n/af_ZA.php
diff --git a/lib/l10n/ar.php b/lib/private/l10n/ar.php
index f626dcdfda6..f626dcdfda6 100644
--- a/lib/l10n/ar.php
+++ b/lib/private/l10n/ar.php
diff --git a/lib/l10n/be.php b/lib/private/l10n/be.php
index 1570411eb86..1570411eb86 100644
--- a/lib/l10n/be.php
+++ b/lib/private/l10n/be.php
diff --git a/lib/l10n/bg_BG.php b/lib/private/l10n/bg_BG.php
index b6cc949eb8a..b6cc949eb8a 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/private/l10n/bg_BG.php
diff --git a/lib/l10n/bn_BD.php b/lib/private/l10n/bn_BD.php
index a42435a2a47..a42435a2a47 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/private/l10n/bn_BD.php
diff --git a/lib/l10n/bs.php b/lib/private/l10n/bs.php
index 3cb98906e62..3cb98906e62 100644
--- a/lib/l10n/bs.php
+++ b/lib/private/l10n/bs.php
diff --git a/lib/l10n/ca.php b/lib/private/l10n/ca.php
index a8769224705..a8769224705 100644
--- a/lib/l10n/ca.php
+++ b/lib/private/l10n/ca.php
diff --git a/lib/l10n/cs_CZ.php b/lib/private/l10n/cs_CZ.php
index ed31ae79529..ed31ae79529 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/private/l10n/cs_CZ.php
diff --git a/lib/l10n/cy_GB.php b/lib/private/l10n/cy_GB.php
index 6973b51878f..6973b51878f 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/private/l10n/cy_GB.php
diff --git a/lib/l10n/da.php b/lib/private/l10n/da.php
index 05a43f42ed9..05a43f42ed9 100644
--- a/lib/l10n/da.php
+++ b/lib/private/l10n/da.php
diff --git a/lib/l10n/de.php b/lib/private/l10n/de.php
index 87e7a67b47b..87e7a67b47b 100644
--- a/lib/l10n/de.php
+++ b/lib/private/l10n/de.php
diff --git a/lib/l10n/de_AT.php b/lib/private/l10n/de_AT.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/de_AT.php
+++ b/lib/private/l10n/de_AT.php
diff --git a/lib/l10n/de_CH.php b/lib/private/l10n/de_CH.php
index 33f3446a693..33f3446a693 100644
--- a/lib/l10n/de_CH.php
+++ b/lib/private/l10n/de_CH.php
diff --git a/lib/l10n/de_DE.php b/lib/private/l10n/de_DE.php
index 09be0eea22d..09be0eea22d 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/private/l10n/de_DE.php
diff --git a/lib/l10n/el.php b/lib/private/l10n/el.php
index dcbf82d4a4b..dcbf82d4a4b 100644
--- a/lib/l10n/el.php
+++ b/lib/private/l10n/el.php
diff --git a/lib/l10n/en@pirate.php b/lib/private/l10n/en@pirate.php
index a8175b1400f..a8175b1400f 100644
--- a/lib/l10n/en@pirate.php
+++ b/lib/private/l10n/en@pirate.php
diff --git a/lib/l10n/en_GB.php b/lib/private/l10n/en_GB.php
index d02f553eda8..d02f553eda8 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/private/l10n/en_GB.php
diff --git a/lib/l10n/eo.php b/lib/private/l10n/eo.php
index 5311dd6eb15..5311dd6eb15 100644
--- a/lib/l10n/eo.php
+++ b/lib/private/l10n/eo.php
diff --git a/lib/l10n/es.php b/lib/private/l10n/es.php
index 047d5d955bb..047d5d955bb 100644
--- a/lib/l10n/es.php
+++ b/lib/private/l10n/es.php
diff --git a/lib/l10n/es_AR.php b/lib/private/l10n/es_AR.php
index f637eb403ed..f637eb403ed 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/private/l10n/es_AR.php
diff --git a/lib/l10n/es_MX.php b/lib/private/l10n/es_MX.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/es_MX.php
+++ b/lib/private/l10n/es_MX.php
diff --git a/lib/l10n/et_EE.php b/lib/private/l10n/et_EE.php
index 85dfaeb52d5..85dfaeb52d5 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/private/l10n/et_EE.php
diff --git a/lib/l10n/eu.php b/lib/private/l10n/eu.php
index 413819f4f94..413819f4f94 100644
--- a/lib/l10n/eu.php
+++ b/lib/private/l10n/eu.php
diff --git a/lib/l10n/fa.php b/lib/private/l10n/fa.php
index e9cb695bade..e9cb695bade 100644
--- a/lib/l10n/fa.php
+++ b/lib/private/l10n/fa.php
diff --git a/lib/l10n/fi.php b/lib/private/l10n/fi.php
index ac1f80a8f73..ac1f80a8f73 100644
--- a/lib/l10n/fi.php
+++ b/lib/private/l10n/fi.php
diff --git a/lib/l10n/fi_FI.php b/lib/private/l10n/fi_FI.php
index 1d2bdab749c..1d2bdab749c 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/private/l10n/fi_FI.php
diff --git a/lib/l10n/fr.php b/lib/private/l10n/fr.php
index ab3d618849e..ab3d618849e 100644
--- a/lib/l10n/fr.php
+++ b/lib/private/l10n/fr.php
diff --git a/lib/l10n/gl.php b/lib/private/l10n/gl.php
index 406272d690f..406272d690f 100644
--- a/lib/l10n/gl.php
+++ b/lib/private/l10n/gl.php
diff --git a/lib/l10n/he.php b/lib/private/l10n/he.php
index ced6244ee91..ced6244ee91 100644
--- a/lib/l10n/he.php
+++ b/lib/private/l10n/he.php
diff --git a/lib/l10n/hi.php b/lib/private/l10n/hi.php
index 039dfa4465d..039dfa4465d 100644
--- a/lib/l10n/hi.php
+++ b/lib/private/l10n/hi.php
diff --git a/lib/l10n/hr.php b/lib/private/l10n/hr.php
index d217f924099..d217f924099 100644
--- a/lib/l10n/hr.php
+++ b/lib/private/l10n/hr.php
diff --git a/lib/l10n/hu_HU.php b/lib/private/l10n/hu_HU.php
index e944291caee..e944291caee 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/private/l10n/hu_HU.php
diff --git a/lib/l10n/hy.php b/lib/private/l10n/hy.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/hy.php
+++ b/lib/private/l10n/hy.php
diff --git a/lib/l10n/ia.php b/lib/private/l10n/ia.php
index 34f43bc424a..34f43bc424a 100644
--- a/lib/l10n/ia.php
+++ b/lib/private/l10n/ia.php
diff --git a/lib/l10n/id.php b/lib/private/l10n/id.php
index 080faddb321..080faddb321 100644
--- a/lib/l10n/id.php
+++ b/lib/private/l10n/id.php
diff --git a/lib/l10n/is.php b/lib/private/l10n/is.php
index 7512d278fb8..7512d278fb8 100644
--- a/lib/l10n/is.php
+++ b/lib/private/l10n/is.php
diff --git a/lib/l10n/it.php b/lib/private/l10n/it.php
index b00789bc86f..b00789bc86f 100644
--- a/lib/l10n/it.php
+++ b/lib/private/l10n/it.php
diff --git a/lib/l10n/ja_JP.php b/lib/private/l10n/ja_JP.php
index b9e6a0e6924..b9e6a0e6924 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/private/l10n/ja_JP.php
diff --git a/lib/l10n/ka.php b/lib/private/l10n/ka.php
index 04fefe8bdf1..04fefe8bdf1 100644
--- a/lib/l10n/ka.php
+++ b/lib/private/l10n/ka.php
diff --git a/lib/l10n/ka_GE.php b/lib/private/l10n/ka_GE.php
index 8fbe34e6786..8fbe34e6786 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/private/l10n/ka_GE.php
diff --git a/lib/l10n/km.php b/lib/private/l10n/km.php
index e7b09649a24..e7b09649a24 100644
--- a/lib/l10n/km.php
+++ b/lib/private/l10n/km.php
diff --git a/lib/l10n/kn.php b/lib/private/l10n/kn.php
index e7b09649a24..e7b09649a24 100644
--- a/lib/l10n/kn.php
+++ b/lib/private/l10n/kn.php
diff --git a/lib/l10n/ko.php b/lib/private/l10n/ko.php
index 3ef39fefa60..3ef39fefa60 100644
--- a/lib/l10n/ko.php
+++ b/lib/private/l10n/ko.php
diff --git a/lib/l10n/ku_IQ.php b/lib/private/l10n/ku_IQ.php
index c99f9dd2a12..c99f9dd2a12 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/private/l10n/ku_IQ.php
diff --git a/lib/l10n/lb.php b/lib/private/l10n/lb.php
index c25f5b55bd5..c25f5b55bd5 100644
--- a/lib/l10n/lb.php
+++ b/lib/private/l10n/lb.php
diff --git a/lib/l10n/lt_LT.php b/lib/private/l10n/lt_LT.php
index db8d96c1018..db8d96c1018 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/private/l10n/lt_LT.php
diff --git a/lib/l10n/lv.php b/lib/private/l10n/lv.php
index 4090a36edcc..4090a36edcc 100644
--- a/lib/l10n/lv.php
+++ b/lib/private/l10n/lv.php
diff --git a/lib/l10n/mk.php b/lib/private/l10n/mk.php
index 69d4a1cb694..69d4a1cb694 100644
--- a/lib/l10n/mk.php
+++ b/lib/private/l10n/mk.php
diff --git a/lib/l10n/ml_IN.php b/lib/private/l10n/ml_IN.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/ml_IN.php
+++ b/lib/private/l10n/ml_IN.php
diff --git a/lib/l10n/ms_MY.php b/lib/private/l10n/ms_MY.php
index 17ef07f83dd..17ef07f83dd 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/private/l10n/ms_MY.php
diff --git a/lib/l10n/my_MM.php b/lib/private/l10n/my_MM.php
index 5f4b6ddc820..5f4b6ddc820 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/private/l10n/my_MM.php
diff --git a/lib/l10n/nb_NO.php b/lib/private/l10n/nb_NO.php
index 8e7d095d369..8e7d095d369 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/private/l10n/nb_NO.php
diff --git a/lib/l10n/ne.php b/lib/private/l10n/ne.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/ne.php
+++ b/lib/private/l10n/ne.php
diff --git a/lib/l10n/nl.php b/lib/private/l10n/nl.php
index 20374f1f0f8..20374f1f0f8 100644
--- a/lib/l10n/nl.php
+++ b/lib/private/l10n/nl.php
diff --git a/lib/l10n/nn_NO.php b/lib/private/l10n/nn_NO.php
index e8bf8dfdef4..e8bf8dfdef4 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/private/l10n/nn_NO.php
diff --git a/lib/l10n/nqo.php b/lib/private/l10n/nqo.php
index e7b09649a24..e7b09649a24 100644
--- a/lib/l10n/nqo.php
+++ b/lib/private/l10n/nqo.php
diff --git a/lib/l10n/oc.php b/lib/private/l10n/oc.php
index 40a527cc76c..40a527cc76c 100644
--- a/lib/l10n/oc.php
+++ b/lib/private/l10n/oc.php
diff --git a/lib/l10n/pa.php b/lib/private/l10n/pa.php
index 069fea6e710..069fea6e710 100644
--- a/lib/l10n/pa.php
+++ b/lib/private/l10n/pa.php
diff --git a/lib/l10n/pl.php b/lib/private/l10n/pl.php
index 270559b4e50..270559b4e50 100644
--- a/lib/l10n/pl.php
+++ b/lib/private/l10n/pl.php
diff --git a/lib/l10n/pl_PL.php b/lib/private/l10n/pl_PL.php
index 5494e3dab25..5494e3dab25 100644
--- a/lib/l10n/pl_PL.php
+++ b/lib/private/l10n/pl_PL.php
diff --git a/lib/l10n/pt_BR.php b/lib/private/l10n/pt_BR.php
index 7a580799701..7a580799701 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/private/l10n/pt_BR.php
diff --git a/lib/l10n/pt_PT.php b/lib/private/l10n/pt_PT.php
index 6e2bcba7b10..6e2bcba7b10 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/private/l10n/pt_PT.php
diff --git a/lib/l10n/ro.php b/lib/private/l10n/ro.php
index 76dafcd03e0..76dafcd03e0 100644
--- a/lib/l10n/ro.php
+++ b/lib/private/l10n/ro.php
diff --git a/lib/l10n/ru.php b/lib/private/l10n/ru.php
index 501065f8b5f..501065f8b5f 100644
--- a/lib/l10n/ru.php
+++ b/lib/private/l10n/ru.php
diff --git a/lib/l10n/si_LK.php b/lib/private/l10n/si_LK.php
index d10804cae69..d10804cae69 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/private/l10n/si_LK.php
diff --git a/lib/l10n/sk.php b/lib/private/l10n/sk.php
index 54812b15a6f..54812b15a6f 100644
--- a/lib/l10n/sk.php
+++ b/lib/private/l10n/sk.php
diff --git a/lib/l10n/sk_SK.php b/lib/private/l10n/sk_SK.php
index 13487b039d6..13487b039d6 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/private/l10n/sk_SK.php
diff --git a/lib/l10n/sl.php b/lib/private/l10n/sl.php
index 5722191aedf..5722191aedf 100644
--- a/lib/l10n/sl.php
+++ b/lib/private/l10n/sl.php
diff --git a/lib/l10n/sq.php b/lib/private/l10n/sq.php
index edaa1df2b86..edaa1df2b86 100644
--- a/lib/l10n/sq.php
+++ b/lib/private/l10n/sq.php
diff --git a/lib/l10n/sr.php b/lib/private/l10n/sr.php
index 9441d0578fc..9441d0578fc 100644
--- a/lib/l10n/sr.php
+++ b/lib/private/l10n/sr.php
diff --git a/lib/l10n/sr@latin.php b/lib/private/l10n/sr@latin.php
index d8fa9289221..d8fa9289221 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/private/l10n/sr@latin.php
diff --git a/lib/l10n/string.php b/lib/private/l10n/string.php
index 88c85b32e70..88c85b32e70 100644
--- a/lib/l10n/string.php
+++ b/lib/private/l10n/string.php
diff --git a/lib/l10n/sv.php b/lib/private/l10n/sv.php
index e7c3420a85b..e7c3420a85b 100644
--- a/lib/l10n/sv.php
+++ b/lib/private/l10n/sv.php
diff --git a/lib/l10n/sw_KE.php b/lib/private/l10n/sw_KE.php
index 15f78e0bce6..15f78e0bce6 100644
--- a/lib/l10n/sw_KE.php
+++ b/lib/private/l10n/sw_KE.php
diff --git a/lib/l10n/ta_LK.php b/lib/private/l10n/ta_LK.php
index e70e65845be..e70e65845be 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/private/l10n/ta_LK.php
diff --git a/lib/l10n/te.php b/lib/private/l10n/te.php
index 524ea0c6024..524ea0c6024 100644
--- a/lib/l10n/te.php
+++ b/lib/private/l10n/te.php
diff --git a/lib/l10n/th_TH.php b/lib/private/l10n/th_TH.php
index 3344d0bb18e..3344d0bb18e 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/private/l10n/th_TH.php
diff --git a/lib/l10n/tr.php b/lib/private/l10n/tr.php
index b63c37c7240..b63c37c7240 100644
--- a/lib/l10n/tr.php
+++ b/lib/private/l10n/tr.php
diff --git a/lib/l10n/ug.php b/lib/private/l10n/ug.php
index e2cf38ecc8c..e2cf38ecc8c 100644
--- a/lib/l10n/ug.php
+++ b/lib/private/l10n/ug.php
diff --git a/lib/l10n/uk.php b/lib/private/l10n/uk.php
index c1513c5bb79..c1513c5bb79 100644
--- a/lib/l10n/uk.php
+++ b/lib/private/l10n/uk.php
diff --git a/lib/l10n/ur_PK.php b/lib/private/l10n/ur_PK.php
index 7dc967ccd93..7dc967ccd93 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/private/l10n/ur_PK.php
diff --git a/lib/l10n/vi.php b/lib/private/l10n/vi.php
index dc0045c35ca..dc0045c35ca 100644
--- a/lib/l10n/vi.php
+++ b/lib/private/l10n/vi.php
diff --git a/lib/l10n/zh_CN.php b/lib/private/l10n/zh_CN.php
index 2c34356ea10..2c34356ea10 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/private/l10n/zh_CN.php
diff --git a/lib/l10n/zh_HK.php b/lib/private/l10n/zh_HK.php
index ca3e6d504e7..ca3e6d504e7 100644
--- a/lib/l10n/zh_HK.php
+++ b/lib/private/l10n/zh_HK.php
diff --git a/lib/l10n/zh_TW.php b/lib/private/l10n/zh_TW.php
index 210c766aa59..210c766aa59 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/private/l10n/zh_TW.php
diff --git a/lib/legacy/cache.php b/lib/private/legacy/cache.php
index f915eb516b1..f915eb516b1 100644
--- a/lib/legacy/cache.php
+++ b/lib/private/legacy/cache.php
diff --git a/lib/legacy/config.php b/lib/private/legacy/config.php
index 7e498013737..7e498013737 100644
--- a/lib/legacy/config.php
+++ b/lib/private/legacy/config.php
diff --git a/lib/legacy/filesystem.php b/lib/private/legacy/filesystem.php
index 34f92b357ca..34f92b357ca 100644
--- a/lib/legacy/filesystem.php
+++ b/lib/private/legacy/filesystem.php
diff --git a/lib/legacy/filesystemview.php b/lib/private/legacy/filesystemview.php
index d6bca62e06a..d6bca62e06a 100644
--- a/lib/legacy/filesystemview.php
+++ b/lib/private/legacy/filesystemview.php
diff --git a/lib/legacy/log.php b/lib/private/legacy/log.php
index 027cb89e97c..027cb89e97c 100644
--- a/lib/legacy/log.php
+++ b/lib/private/legacy/log.php
diff --git a/lib/legacy/preferences.php b/lib/private/legacy/preferences.php
index a663db7598b..a663db7598b 100644
--- a/lib/legacy/preferences.php
+++ b/lib/private/legacy/preferences.php
diff --git a/lib/legacy/updater.php b/lib/private/legacy/updater.php
index eea7bb129cf..eea7bb129cf 100644
--- a/lib/legacy/updater.php
+++ b/lib/private/legacy/updater.php
diff --git a/lib/log.php b/lib/private/log.php
index e0b9fe3c696..e0b9fe3c696 100644
--- a/lib/log.php
+++ b/lib/private/log.php
diff --git a/lib/log/errorhandler.php b/lib/private/log/errorhandler.php
index 69cb960de91..69cb960de91 100644
--- a/lib/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
diff --git a/lib/log/owncloud.php b/lib/private/log/owncloud.php
index d16b9537a16..d16b9537a16 100644
--- a/lib/log/owncloud.php
+++ b/lib/private/log/owncloud.php
diff --git a/lib/log/rotate.php b/lib/private/log/rotate.php
index bf23ad588b3..bf23ad588b3 100644
--- a/lib/log/rotate.php
+++ b/lib/private/log/rotate.php
diff --git a/lib/log/syslog.php b/lib/private/log/syslog.php
index c98deab7109..c98deab7109 100644
--- a/lib/log/syslog.php
+++ b/lib/private/log/syslog.php
diff --git a/lib/mail.php b/lib/private/mail.php
index b339b33e962..b339b33e962 100644
--- a/lib/mail.php
+++ b/lib/private/mail.php
diff --git a/lib/memcache/apc.php b/lib/private/memcache/apc.php
index 575ee4427db..575ee4427db 100644
--- a/lib/memcache/apc.php
+++ b/lib/private/memcache/apc.php
diff --git a/lib/memcache/apcu.php b/lib/private/memcache/apcu.php
index ccc1aa6e562..ccc1aa6e562 100644
--- a/lib/memcache/apcu.php
+++ b/lib/private/memcache/apcu.php
diff --git a/lib/memcache/cache.php b/lib/private/memcache/cache.php
index 0ad1cc7ec03..0ad1cc7ec03 100644
--- a/lib/memcache/cache.php
+++ b/lib/private/memcache/cache.php
diff --git a/lib/memcache/factory.php b/lib/private/memcache/factory.php
index fde7d947567..fde7d947567 100644
--- a/lib/memcache/factory.php
+++ b/lib/private/memcache/factory.php
diff --git a/lib/memcache/memcached.php b/lib/private/memcache/memcached.php
index 978e6c2eff1..978e6c2eff1 100644
--- a/lib/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
diff --git a/lib/memcache/xcache.php b/lib/private/memcache/xcache.php
index 33de30562f9..33de30562f9 100644
--- a/lib/memcache/xcache.php
+++ b/lib/private/memcache/xcache.php
diff --git a/lib/migrate.php b/lib/private/migrate.php
index 0b319177400..0b319177400 100644
--- a/lib/migrate.php
+++ b/lib/private/migrate.php
diff --git a/lib/migration/content.php b/lib/private/migration/content.php
index 4413d722731..4413d722731 100644
--- a/lib/migration/content.php
+++ b/lib/private/migration/content.php
diff --git a/lib/migration/provider.php b/lib/private/migration/provider.php
index 234ab3351f3..234ab3351f3 100644
--- a/lib/migration/provider.php
+++ b/lib/private/migration/provider.php
diff --git a/lib/mimetypes.list.php b/lib/private/mimetypes.list.php
index 8ab8ac81bd8..8ab8ac81bd8 100644
--- a/lib/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
diff --git a/lib/minimizer.php b/lib/private/minimizer.php
index db522de74dc..db522de74dc 100644
--- a/lib/minimizer.php
+++ b/lib/private/minimizer.php
diff --git a/lib/minimizer/css.php b/lib/private/minimizer/css.php
index 8d130572e2b..8d130572e2b 100644
--- a/lib/minimizer/css.php
+++ b/lib/private/minimizer/css.php
diff --git a/lib/minimizer/js.php b/lib/private/minimizer/js.php
index bd2d836deb0..bd2d836deb0 100644
--- a/lib/minimizer/js.php
+++ b/lib/private/minimizer/js.php
diff --git a/lib/navigationmanager.php b/lib/private/navigationmanager.php
index 1f657b9ad80..1f657b9ad80 100644
--- a/lib/navigationmanager.php
+++ b/lib/private/navigationmanager.php
diff --git a/lib/notsquareexception.php b/lib/private/notsquareexception.php
index 03dba8fb25f..03dba8fb25f 100644
--- a/lib/notsquareexception.php
+++ b/lib/private/notsquareexception.php
diff --git a/lib/ocs.php b/lib/private/ocs.php
index 93e8931ce2e..93e8931ce2e 100644
--- a/lib/ocs.php
+++ b/lib/private/ocs.php
diff --git a/lib/ocs/cloud.php b/lib/private/ocs/cloud.php
index 2dd99319057..2dd99319057 100644
--- a/lib/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
diff --git a/lib/ocs/config.php b/lib/private/ocs/config.php
index f19121f4b2b..f19121f4b2b 100644
--- a/lib/ocs/config.php
+++ b/lib/private/ocs/config.php
diff --git a/lib/ocs/person.php b/lib/private/ocs/person.php
index 1c8210d0825..1c8210d0825 100644
--- a/lib/ocs/person.php
+++ b/lib/private/ocs/person.php
diff --git a/lib/ocs/privatedata.php b/lib/private/ocs/privatedata.php
index 4dfd0a6e66e..4dfd0a6e66e 100644
--- a/lib/ocs/privatedata.php
+++ b/lib/private/ocs/privatedata.php
diff --git a/lib/ocs/result.php b/lib/private/ocs/result.php
index 84f06fa01c7..84f06fa01c7 100644
--- a/lib/ocs/result.php
+++ b/lib/private/ocs/result.php
diff --git a/lib/ocsclient.php b/lib/private/ocsclient.php
index 58636f806be..58636f806be 100644
--- a/lib/ocsclient.php
+++ b/lib/private/ocsclient.php
diff --git a/lib/preferences.php b/lib/private/preferences.php
index 359d9a83589..359d9a83589 100644
--- a/lib/preferences.php
+++ b/lib/private/preferences.php
diff --git a/lib/preview.php b/lib/private/preview.php
index 266f7795f12..266f7795f12 100755
--- a/lib/preview.php
+++ b/lib/private/preview.php
diff --git a/lib/preview/image.php b/lib/private/preview/image.php
index 9aec967282d..9aec967282d 100644
--- a/lib/preview/image.php
+++ b/lib/private/preview/image.php
diff --git a/lib/preview/movies.php b/lib/private/preview/movies.php
index c318137ff0e..c318137ff0e 100644
--- a/lib/preview/movies.php
+++ b/lib/private/preview/movies.php
diff --git a/lib/preview/mp3.php b/lib/private/preview/mp3.php
index 1eed566315c..1eed566315c 100644
--- a/lib/preview/mp3.php
+++ b/lib/private/preview/mp3.php
diff --git a/lib/preview/office-cl.php b/lib/private/preview/office-cl.php
index 112909d6523..112909d6523 100644
--- a/lib/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
diff --git a/lib/preview/office-fallback.php b/lib/private/preview/office-fallback.php
index e69ab0ab8cb..e69ab0ab8cb 100644
--- a/lib/preview/office-fallback.php
+++ b/lib/private/preview/office-fallback.php
diff --git a/lib/preview/office.php b/lib/private/preview/office.php
index 5287bbd6ac1..5287bbd6ac1 100644
--- a/lib/preview/office.php
+++ b/lib/private/preview/office.php
diff --git a/lib/preview/pdf.php b/lib/private/preview/pdf.php
index cc974b68818..cc974b68818 100644
--- a/lib/preview/pdf.php
+++ b/lib/private/preview/pdf.php
diff --git a/lib/preview/provider.php b/lib/private/preview/provider.php
index e4a730bafc8..e4a730bafc8 100644
--- a/lib/preview/provider.php
+++ b/lib/private/preview/provider.php
diff --git a/lib/preview/svg.php b/lib/private/preview/svg.php
index b49e51720fa..b49e51720fa 100644
--- a/lib/preview/svg.php
+++ b/lib/private/preview/svg.php
diff --git a/lib/preview/txt.php b/lib/private/preview/txt.php
index 77e728eb364..77e728eb364 100644
--- a/lib/preview/txt.php
+++ b/lib/private/preview/txt.php
diff --git a/lib/preview/unknown.php b/lib/private/preview/unknown.php
index 9e6cd68d401..9e6cd68d401 100644
--- a/lib/preview/unknown.php
+++ b/lib/private/preview/unknown.php
diff --git a/lib/previewmanager.php b/lib/private/previewmanager.php
index ac9a866a75b..ac9a866a75b 100755
--- a/lib/previewmanager.php
+++ b/lib/private/previewmanager.php
diff --git a/lib/request.php b/lib/private/request.php
index df33217f95d..df33217f95d 100755
--- a/lib/request.php
+++ b/lib/private/request.php
diff --git a/lib/response.php b/lib/private/response.php
index 674176d078b..674176d078b 100644
--- a/lib/response.php
+++ b/lib/private/response.php
diff --git a/lib/route.php b/lib/private/route.php
index 5901717c094..5901717c094 100644
--- a/lib/route.php
+++ b/lib/private/route.php
diff --git a/lib/router.php b/lib/private/router.php
index dbaca9e0d5d..dbaca9e0d5d 100644
--- a/lib/router.php
+++ b/lib/private/router.php
diff --git a/lib/search.php b/lib/private/search.php
index b9c75dfc333..b9c75dfc333 100644
--- a/lib/search.php
+++ b/lib/private/search.php
diff --git a/lib/search/provider.php b/lib/private/search/provider.php
index b617b9c5d94..b617b9c5d94 100644
--- a/lib/search/provider.php
+++ b/lib/private/search/provider.php
diff --git a/lib/search/provider/file.php b/lib/private/search/provider/file.php
index 9bd50931517..9bd50931517 100644
--- a/lib/search/provider/file.php
+++ b/lib/private/search/provider/file.php
diff --git a/lib/search/result.php b/lib/private/search/result.php
index 42275c2df11..42275c2df11 100644
--- a/lib/search/result.php
+++ b/lib/private/search/result.php
diff --git a/lib/server.php b/lib/private/server.php
index cabb15324ec..cabb15324ec 100644
--- a/lib/server.php
+++ b/lib/private/server.php
diff --git a/lib/session/internal.php b/lib/private/session/internal.php
index 60aecccc8aa..60aecccc8aa 100644
--- a/lib/session/internal.php
+++ b/lib/private/session/internal.php
diff --git a/lib/session/memory.php b/lib/private/session/memory.php
index c148ff4b9b9..c148ff4b9b9 100644
--- a/lib/session/memory.php
+++ b/lib/private/session/memory.php
diff --git a/lib/session/session.php b/lib/private/session/session.php
index c55001eccac..c55001eccac 100644
--- a/lib/session/session.php
+++ b/lib/private/session/session.php
diff --git a/lib/setup.php b/lib/private/setup.php
index 6bf3c88370f..6bf3c88370f 100644
--- a/lib/setup.php
+++ b/lib/private/setup.php
diff --git a/lib/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 0beada7bd29..0beada7bd29 100644
--- a/lib/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
diff --git a/lib/setup/mssql.php b/lib/private/setup/mssql.php
index b8329f99079..b8329f99079 100644
--- a/lib/setup/mssql.php
+++ b/lib/private/setup/mssql.php
diff --git a/lib/setup/mysql.php b/lib/private/setup/mysql.php
index d97b6d2602f..d97b6d2602f 100644
--- a/lib/setup/mysql.php
+++ b/lib/private/setup/mysql.php
diff --git a/lib/setup/oci.php b/lib/private/setup/oci.php
index 326d7a00531..326d7a00531 100644
--- a/lib/setup/oci.php
+++ b/lib/private/setup/oci.php
diff --git a/lib/setup/postgresql.php b/lib/private/setup/postgresql.php
index 89d328ada19..89d328ada19 100644
--- a/lib/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
diff --git a/lib/setup/sqlite.php b/lib/private/setup/sqlite.php
index fd4df792d62..fd4df792d62 100644
--- a/lib/setup/sqlite.php
+++ b/lib/private/setup/sqlite.php
diff --git a/lib/subadmin.php b/lib/private/subadmin.php
index 8cda7240ac9..8cda7240ac9 100644
--- a/lib/subadmin.php
+++ b/lib/private/subadmin.php
diff --git a/lib/template.php b/lib/private/template.php
index 9b2c1211e61..9b2c1211e61 100644
--- a/lib/template.php
+++ b/lib/private/template.php
diff --git a/lib/template/base.php b/lib/private/template/base.php
index 88941bc7132..88941bc7132 100644
--- a/lib/template/base.php
+++ b/lib/private/template/base.php
diff --git a/lib/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php
index 8e7831ca549..8e7831ca549 100644
--- a/lib/template/cssresourcelocator.php
+++ b/lib/private/template/cssresourcelocator.php
diff --git a/lib/template/functions.php b/lib/private/template/functions.php
index 501f8081bff..501f8081bff 100644
--- a/lib/template/functions.php
+++ b/lib/private/template/functions.php
diff --git a/lib/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php
index f8fe3817ce6..f8fe3817ce6 100644
--- a/lib/template/jsresourcelocator.php
+++ b/lib/private/template/jsresourcelocator.php
diff --git a/lib/template/resourcelocator.php b/lib/private/template/resourcelocator.php
index 9f83673664d..9f83673664d 100644
--- a/lib/template/resourcelocator.php
+++ b/lib/private/template/resourcelocator.php
diff --git a/lib/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php
index d5a484b1a14..d5a484b1a14 100644
--- a/lib/template/templatefilelocator.php
+++ b/lib/private/template/templatefilelocator.php
diff --git a/lib/templatelayout.php b/lib/private/templatelayout.php
index 625f3424a04..625f3424a04 100644
--- a/lib/templatelayout.php
+++ b/lib/private/templatelayout.php
diff --git a/lib/updater.php b/lib/private/updater.php
index df7332a96a9..df7332a96a9 100644
--- a/lib/updater.php
+++ b/lib/private/updater.php
diff --git a/lib/user.php b/lib/private/user.php
index 15e807088b4..15e807088b4 100644
--- a/lib/user.php
+++ b/lib/private/user.php
diff --git a/lib/user/backend.php b/lib/private/user/backend.php
index e9be08e429c..e9be08e429c 100644
--- a/lib/user/backend.php
+++ b/lib/private/user/backend.php
diff --git a/lib/user/database.php b/lib/private/user/database.php
index 9f00a022d9f..9f00a022d9f 100644
--- a/lib/user/database.php
+++ b/lib/private/user/database.php
diff --git a/lib/user/dummy.php b/lib/private/user/dummy.php
index b5b7a6c3c7a..b5b7a6c3c7a 100644
--- a/lib/user/dummy.php
+++ b/lib/private/user/dummy.php
diff --git a/lib/user/example.php b/lib/private/user/example.php
index b2d0dc25410..b2d0dc25410 100644
--- a/lib/user/example.php
+++ b/lib/private/user/example.php
diff --git a/lib/user/http.php b/lib/private/user/http.php
index e99afe59ba7..e99afe59ba7 100644
--- a/lib/user/http.php
+++ b/lib/private/user/http.php
diff --git a/lib/user/interface.php b/lib/private/user/interface.php
index c72bdfaf3fd..c72bdfaf3fd 100644
--- a/lib/user/interface.php
+++ b/lib/private/user/interface.php
diff --git a/lib/user/manager.php b/lib/private/user/manager.php
index 13286bc28a4..13286bc28a4 100644
--- a/lib/user/manager.php
+++ b/lib/private/user/manager.php
diff --git a/lib/user/session.php b/lib/private/user/session.php
index 525c65ab8a1..525c65ab8a1 100644
--- a/lib/user/session.php
+++ b/lib/private/user/session.php
diff --git a/lib/user/user.php b/lib/private/user/user.php
index e5f842944f1..e5f842944f1 100644
--- a/lib/user/user.php
+++ b/lib/private/user/user.php
diff --git a/lib/util.php b/lib/private/util.php
index 6be56d07c9a..6be56d07c9a 100755
--- a/lib/util.php
+++ b/lib/private/util.php
diff --git a/lib/vobject.php b/lib/private/vobject.php
index 267176ebc07..267176ebc07 100644
--- a/lib/vobject.php
+++ b/lib/private/vobject.php
diff --git a/lib/vobject/compoundproperty.php b/lib/private/vobject/compoundproperty.php
index 7fe42574bed..7fe42574bed 100644
--- a/lib/vobject/compoundproperty.php
+++ b/lib/private/vobject/compoundproperty.php
diff --git a/lib/vobject/stringproperty.php b/lib/private/vobject/stringproperty.php
index a9d63a0a789..a9d63a0a789 100644
--- a/lib/vobject/stringproperty.php
+++ b/lib/private/vobject/stringproperty.php