Merge branch 'master' into scrutinizer_documentation_patches

Conflicts:
	lib/private/migration/content.php

diff --cc apps/files_encryption/hooks/hooks.php
Simple merge

diff --cc apps/files_encryption/lib/helper.php
Simple merge

diff --cc apps/files_encryption/lib/session.php
Simple merge

diff --cc apps/files_encryption/lib/util.php
Simple merge

diff --cc apps/files_encryption/tests/util.php
Simple merge

diff --cc apps/files_external/lib/google.php
Simple merge

diff --cc apps/files_trashbin/lib/trashbin.php
Simple merge

diff --cc apps/files_versions/lib/versions.php
Simple merge

diff --cc lib/private/backgroundjob/joblist.php
index 822878160905984a0ab813d22e8d934ee9d32fad,586e99a3cbc4b880ce325bc8d9c078c7f2cb4924..2740d2bd8561629c87c3cf130133176f79196660
--- 1/lib/private/backgroundjob/joblist.php
--- 2/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@@ -154,10 -168,10 +168,10 @@@ class JobList implements IJobList 
        /**
         * get the id of the last ran job
         *
 -       * @return int
 +       * @return string
         */
        public function getLastJob() {
-               return \OC_Appconfig::getValue('backgroundjob', 'lastjob', 0);
+               return $this->config->getAppValue('backgroundjob', 'lastjob', 0);
        }
  
        /**

diff --cc lib/private/cache/fileglobal.php
Simple merge

diff --cc lib/private/db.php
Simple merge

diff --cc lib/private/db/statementwrapper.php
Simple merge

diff --cc lib/private/migrate.php
Simple merge

diff --cc lib/private/migration/content.php
index 81b53817433e518f7ddba4151705a2a99459e41f,d6eee40786e0ca33fa2353a8bdde521efa4f7087..e7b6543171aecdb5cf72d9421eb014ccadd93627
--- 1/lib/private/migration/content.php
--- 2/lib/private/migration/content.php
+++ b/lib/private/migration/content.php
@@@ -34,9 -34,9 +34,9 @@@ class OC_Migration_Content
  
        /**
        * @brief sets up the
-       * @param ZipArchive $zip ZipArchive object
-       * @param optional $db a MDB2 database object (required for exporttype user)
-       * @return boolean|null
+       * @param $zip ZipArchive object
 -      * @param optional $db a database object (required for exporttype user)
++      * @param $db a database object (required for exporttype user)
+       * @return bool
        */
        public function __construct( $zip, $db=null ) {
  

diff --cc lib/private/util.php
index 1d24d5d9b5ec8a4ae37e531d97454fbf2af9d592,246c82a26c70902488db42898eccb4b7d7363a96..af39d983f6748655d64689e748c1e9880b028303
--- 1/lib/private/util.php
--- 2/lib/private/util.php
+++ b/lib/private/util.php
@@@ -90,13 -90,11 +90,14 @@@ class OC_Util 
                return true;
        }
  
 +      /**
 +       * @param string $user
 +       */
        public static function getUserQuota($user){
-               $userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default');
+               $config = \OC::$server->getConfig();
+               $userQuota = $config->getUserValue($user, 'files', 'quota', 'default');
                if($userQuota === 'default') {
-                       $userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none');
+                       $userQuota = $config->getAppValue('files', 'default_quota', 'none');
                }
                if($userQuota === 'none') {
                        return \OC\Files\SPACE_UNLIMITED;

diff --cc lib/public/backgroundjob.php
index dcf67da95706055483d42d3034060268420296e0,bcaf6e35454e2259d01692f7023599d8057469d4..bcd27c1d1986de38af92d23db40f75a28c468e96
--- 1/lib/public/backgroundjob.php
--- 2/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@@ -115,10 -115,10 +115,10 @@@ class BackgroundJob 
         * @deprecated
         * Gets one queued task
         * @param int $id ID of the task
 -       * @return associative array
 +       * @return \OC\BackgroundJob\Job|null array
         */
        public static function findQueuedTask($id) {
-               $jobList = new JobList();
+               $jobList = \OC::$server->getJobList();
                return $jobList->getById($id);
        }
  

diff --cc lib/public/config.php
Simple merge

diff --cc lib/public/iconfig.php
Simple merge