migrate \OC\AllConfig to \OCP\IConfig

diff --git a/lib/private/httphelper.php b/lib/private/httphelper.php
index dfc1bcf47cd2f4c7738a4d7f80cf03cebf26759d..846825dee8de0b0fd9621b527621dfaef62441f2 100644 (file)
--- a/lib/private/httphelper.php
+++ b/lib/private/httphelper.php
@@ -8,16 +8,18 @@
 
 namespace OC;
 
+use \OCP\IConfig;
+
 class HTTPHelper {
        const USER_AGENT = 'ownCloud Server Crawler';
 
-       /** @var \OC\AllConfig */
+       /** @var \OCP\IConfig */
        private $config;
 
        /**
-        * @param \OC\AllConfig $config
+        * @param \OCP\IConfig $config
         */
-       public function __construct(AllConfig $config) {
+       public function __construct(IConfig $config) {
                $this->config = $config;
        }
 

diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 2403f45aa2f4a6f5ebe019b46323975ddafc3864..4fa3711e3b865bce24b8c23f328f39be7dc698c1 100644 (file)
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -11,6 +11,7 @@ namespace OC\User;
 
 use OC\Hooks\PublicEmitter;
 use OCP\IUserManager;
+use OCP\IConfig;
 
 /**
  * Class Manager
@@ -37,14 +38,14 @@ class Manager extends PublicEmitter implements IUserManager {
        private $cachedUsers = array();
 
        /**
-        * @var \OC\AllConfig $config
+        * @var \OCP\IConfig $config
         */
        private $config;
 
        /**
-        * @param \OC\AllConfig $config
+        * @param \OCP\IConfig $config
         */
-       public function __construct($config = null) {
+       public function __construct(IConfig $config = null) {
                $this->config = $config;
                $cachedUsers = &$this->cachedUsers;
                $this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index ad85337f628368864b7514669ff47a8f1f9e61c3..fb66f893c612b3b22dedaa97a2a0f793b21ac98b 100644 (file)
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -11,6 +11,7 @@ namespace OC\User;
 
 use OC\Hooks\Emitter;
 use OCP\IUser;
+use OCP\IConfig;
 
 class User implements IUser {
        /**
@@ -49,7 +50,7 @@ class User implements IUser {
        private $lastLogin;
 
        /**
-        * @var \OC\AllConfig $config
+        * @var \OCP\IConfig $config
         */
        private $config;
 
@@ -57,9 +58,9 @@ class User implements IUser {
         * @param string $uid
         * @param \OC_User_Interface $backend
         * @param \OC\Hooks\Emitter $emitter
-        * @param \OC\AllConfig $config
+        * @param \OCP\IConfig $config
         */
-       public function __construct($uid, $backend, $emitter = null, $config = null) {
+       public function __construct($uid, $backend, $emitter = null, IConfig $config = null) {
                $this->uid = $uid;
                $this->backend = $backend;
                $this->emitter = $emitter;

diff --git a/tests/lib/app/infoparser.php b/tests/lib/app/infoparser.php
index 13c0b51e117e212e9543bf39a6f42787ca00bf2b..e291b616e8bde3759ff129c5f9eb1a5e3487ea21 100644 (file)
--- a/tests/lib/app/infoparser.php
+++ b/tests/lib/app/infoparser.php
@@ -19,7 +19,7 @@ class InfoParser extends \PHPUnit_Framework_TestCase {
        private $parser;
 
        public function setUp() {
-               $config = $this->getMockBuilder('\OC\AllConfig')
+               $config = $this->getMockBuilder('\OCP\IConfig')
                        ->disableOriginalConstructor()->getMock();
                $httpHelper = $this->getMockBuilder('\OC\HTTPHelper')
                        ->setConstructorArgs(array($config))

diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php
index eb58508f1583b33ed240011347d0f0a3557aaad5..1cc4232ab4b354fe9fb080bbce53fac9856b2496 100644 (file)
--- a/tests/lib/httphelper.php
+++ b/tests/lib/httphelper.php
@@ -8,7 +8,7 @@
 
 class TestHTTPHelper extends \Test\TestCase {
 
-       /** @var \OC\AllConfig*/
+       /** @var \OCP\IConfig*/
        private $config;
        /** @var \OC\HTTPHelper */
        private $httpHelperMock;
@@ -16,7 +16,7 @@ class TestHTTPHelper extends \Test\TestCase {
        protected function setUp() {
                parent::setUp();
 
-               $this->config = $this->getMockBuilder('\OC\AllConfig')
+               $this->config = $this->getMockBuilder('\OCP\IConfig')
                        ->disableOriginalConstructor()->getMock();
                $this->httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper')
                        ->setConstructorArgs(array($this->config))

diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index 85ade9ccaf128b165d339b618f86c64863272438..a940d6eb627b9b2f9120d560c08481964ff1ff46 100644 (file)
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -9,7 +9,6 @@
 
 namespace Test\User;
 
-use OC\AllConfig;
 use OC\Hooks\PublicEmitter;
 
 class User extends \Test\TestCase {
@@ -228,7 +227,7 @@ class User extends \Test\TestCase {
                        ->method('implementsActions')
                        ->will($this->returnValue(false));
 
-               $allConfig = $this->getMockBuilder('\OC\AllConfig')
+               $allConfig = $this->getMockBuilder('\OCP\IConfig')
                        ->disableOriginalConstructor()
                        ->getMock();
                $allConfig->expects($this->any())