Merge pull request #7840 from nextcloud/dep_config

Remove deprecated \OCP\Config

2 files changed, 2 insertions, 40 deletions

diff --git a/tests/lib/PublicNamespace/OCPConfigTest.php b/tests/lib/PublicNamespace/OCPConfigTest.php
deleted file mode 100644
index 44fd234735e..00000000000
--- a/tests/lib/PublicNamespace/OCPConfigTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Thomas Müller
- * @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Test\PublicNamespace;
-
-class OCPConfigTest extends \Test\TestCase {
-
-	public function testSetAppValueIfSetToNull() {
-
-		$key = $this->getUniqueID('key-');
-
-		$result = \OCP\Config::setAppValue('unit-test', $key, null);
-		$this->assertTrue($result);
-
-		$result = \OCP\Config::setAppValue('unit-test', $key, '12');
-		$this->assertTrue($result);
-
-	}
-
-}
diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php
index 16d03b049fe..037736bf00f 100644
--- a/tests/lib/UtilTest.php
+++ b/tests/lib/UtilTest.php
@@ -304,12 +304,12 @@ class UtilTest extends \Test\TestCase {
 
 		// need to set a user id to make sure enabled apps are read from cache
 		\OC_User::setUserId($this->getUniqueID());
-		\OCP\Config::setSystemValue('defaultapp', $defaultAppConfig);
+		\OC::$server->getConfig()->setSystemValue('defaultapp', $defaultAppConfig);
 		$this->assertEquals('http://localhost/' . $expectedPath, Dummy_OC_Util::getDefaultPageUrl());
 
 		// restore old state
 		\OC::$WEBROOT = $oldWebRoot;
-		\OCP\Config::setSystemValue('defaultapp', $oldDefaultApps);
+		\OC::$server->getConfig()->setSystemValue('defaultapp', $oldDefaultApps);
 		\OC_User::setUserId(null);
 	}