From 8a41d05761a14292ab0457f4143bb84d237bbcbd Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 13 Jan 2018 14:25:04 +0100 Subject: [PATCH 1/2] Remove deprecated \OCP\Config Signed-off-by: Roeland Jago Douma --- apps/user_ldap/appinfo/install.php | 2 +- apps/user_ldap/lib/Configuration.php | 2 +- apps/user_ldap/lib/Jobs/UpdateGroups.php | 2 +- .../App/CodeChecker/DeprecationCheck.php | 1 - lib/private/Files/Cache/Scanner.php | 1 - lib/private/Share/Share.php | 8 +- lib/private/legacy/util.php | 4 +- lib/public/Config.php | 164 ------------------ tests/lib/PublicNamespace/OCPConfigTest.php | 38 ---- tests/lib/UtilTest.php | 4 +- 10 files changed, 11 insertions(+), 215 deletions(-) delete mode 100644 lib/public/Config.php delete mode 100644 tests/lib/PublicNamespace/OCPConfigTest.php diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php index f0701c6645..3166055395 100644 --- a/apps/user_ldap/appinfo/install.php +++ b/apps/user_ldap/appinfo/install.php @@ -25,7 +25,7 @@ $config = \OC::$server->getConfig(); $state = $config->getSystemValue('ldapIgnoreNamingRules', 'doSet'); if($state === 'doSet') { - OCP\Config::setSystemValue('ldapIgnoreNamingRules', false); + \OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false); } $helper = new \OCA\User_LDAP\Helper($config); diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index 8522962172..7179d9aa39 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -372,7 +372,7 @@ class Configuration { if(is_null($defaults)) { $defaults = $this->getDefaults(); } - return \OCP\Config::getAppValue('user_ldap', + return \OC::$server->getConfig()->getAppValue('user_ldap', $this->configPrefix.$varName, $defaults[$varName]); } diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index a118d54d36..c5eff77dbe 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -85,7 +85,7 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { */ static private function getRefreshInterval() { //defaults to every hour - return \OCP\Config::getAppValue('user_ldap', 'bgjRefreshInterval', 3600); + return \OC::$server->getConfig()->getAppValue('user_ldap', 'bgjRefreshInterval', 3600); } /** diff --git a/lib/private/App/CodeChecker/DeprecationCheck.php b/lib/private/App/CodeChecker/DeprecationCheck.php index 037a2cee84..c8b8d639f4 100644 --- a/lib/private/App/CodeChecker/DeprecationCheck.php +++ b/lib/private/App/CodeChecker/DeprecationCheck.php @@ -38,7 +38,6 @@ class DeprecationCheck extends AbstractCheck implements ICheck { return [ 'OC_JSON' => '8.2.0', - 'OCP\Config' => '8.0.0', 'OCP\Contacts' => '8.1.0', 'OCP\DB' => '8.1.0', 'OCP\IHelper' => '8.1.0', diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index a6adccbb4e..85a89962f7 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -36,7 +36,6 @@ namespace OC\Files\Cache; use OC\Files\Filesystem; use OC\Hooks\BasicEmitter; -use OCP\Config; use OCP\Files\Cache\IScanner; use OCP\Files\ForbiddenException; use OCP\Lock\ILockingProvider; diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 4a4f9289f2..193e0c1a27 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -763,7 +763,7 @@ class Share extends Constants { // initialize max date with share time $maxDate = new \DateTime(); $maxDate->setTimestamp($shareTime); - $maxDays = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); + $maxDays = \OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7'); $maxDate->add(new \DateInterval('P' . $maxDays . 'D')); if ($date > $maxDate) { $warning = 'Cannot set expiration date. Shares cannot expire later than ' . $maxDays . ' after they have been shared'; @@ -2152,7 +2152,7 @@ class Share extends Constants { * @return bool */ public static function isDefaultExpireDateEnabled() { - $defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no'); + $defaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no'); return ($defaultExpireDateEnabled === "yes") ? true : false; } @@ -2160,7 +2160,7 @@ class Share extends Constants { * @return bool */ public static function enforceDefaultExpireDate() { - $enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no'); + $enforceDefaultExpireDate = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no'); return ($enforceDefaultExpireDate === "yes") ? true : false; } @@ -2168,7 +2168,7 @@ class Share extends Constants { * @return int */ public static function getExpireInterval() { - return (int)\OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); + return (int)\OC::$server->getConfig()->getAppValue('core', 'shareapi_expire_after_n_days', '7'); } /** diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 5cc83c0c30..aaedd88a7f 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -341,10 +341,10 @@ class OC_Util { * @suppress PhanDeprecatedFunction */ public static function isDefaultExpireDateEnforced() { - $isDefaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no'); + $isDefaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no'); $enforceDefaultExpireDate = false; if ($isDefaultExpireDateEnabled === 'yes') { - $value = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no'); + $value = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no'); $enforceDefaultExpireDate = ($value === 'yes') ? true : false; } diff --git a/lib/public/Config.php b/lib/public/Config.php deleted file mode 100644 index 136b7578f4..0000000000 --- a/lib/public/Config.php +++ /dev/null @@ -1,164 +0,0 @@ - - * @author Frank Karlitschek - * @author Georg Ehrke - * @author Jörn Friedrich Dreyer - * @author Lukas Reschke - * @author Morris Jobke - * @author Robin Appelman - * @author Thomas Müller - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program 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, version 3, - * along with this program. If not, see - * - */ - -/** - * Public interface of ownCloud for apps to use. - * Config Class - * - */ - -/** - * Use OCP namespace for all classes that are considered public. - * - * Classes that use this namespace are for use by apps, and not for use by internal - * OC classes - */ -namespace OCP; - -/** - * This class provides functions to read and write configuration data. - * configuration can be on a system, application or user level - * @deprecated 8.0.0 use methods of \OCP\IConfig - */ -class Config { - /** - * Gets a value from config.php - * @param string $key key - * @param mixed $default = null default value - * @return mixed the value or $default - * @deprecated 8.0.0 use method getSystemValue of \OCP\IConfig - * - * This function gets the value from config.php. If it does not exist, - * $default will be returned. - */ - public static function getSystemValue( $key, $default = null ) { - return \OC::$server->getConfig()->getSystemValue( $key, $default ); - } - - /** - * Sets a value - * @param string $key key - * @param mixed $value value - * @return bool - * @deprecated 8.0.0 use method setSystemValue of \OCP\IConfig - * - * This function sets the value and writes the config.php. If the file can - * not be written, false will be returned. - */ - public static function setSystemValue( $key, $value ) { - try { - \OC::$server->getConfig()->setSystemValue( $key, $value ); - } catch (\Exception $e) { - return false; - } - return true; - } - - /** - * Deletes a value from config.php - * @param string $key key - * @deprecated 8.0.0 use method deleteSystemValue of \OCP\IConfig - * - * This function deletes the value from config.php. - */ - public static function deleteSystemValue( $key ) { - \OC::$server->getConfig()->deleteSystemValue( $key ); - } - - /** - * Gets the config value - * @param string $app app - * @param string $key key - * @param string $default = null, default value if the key does not exist - * @return string the value or $default - * @deprecated 8.0.0 use method getAppValue of \OCP\IConfig - * - * This function gets a value from the appconfig table. If the key does - * not exist the default value will be returned - */ - public static function getAppValue( $app, $key, $default = null ) { - return \OC::$server->getConfig()->getAppValue( $app, $key, $default ); - } - - /** - * Sets a value in the appconfig - * @param string $app app - * @param string $key key - * @param string $value value - * @return boolean true/false - * @deprecated 8.0.0 use method setAppValue of \OCP\IConfig - * - * Sets a value. If the key did not exist before it will be created. - */ - public static function setAppValue( $app, $key, $value ) { - try { - \OC::$server->getConfig()->setAppValue( $app, $key, $value ); - } catch (\Exception $e) { - return false; - } - return true; - } - - /** - * Gets the preference - * @param string $user user - * @param string $app app - * @param string $key key - * @param string $default = null, default value if the key does not exist - * @return string the value or $default - * @deprecated 8.0.0 use method getUserValue of \OCP\IConfig - * - * This function gets a value from the preferences table. If the key does - * not exist the default value will be returned - */ - public static function getUserValue( $user, $app, $key, $default = null ) { - return \OC::$server->getConfig()->getUserValue( $user, $app, $key, $default ); - } - - /** - * Sets a value in the preferences - * @param string $user user - * @param string $app app - * @param string $key key - * @param string $value value - * @return bool - * @deprecated 8.0.0 use method setUserValue of \OCP\IConfig - * - * Adds a value to the preferences. If the key did not exist before, it - * will be added automagically. - */ - public static function setUserValue( $user, $app, $key, $value ) { - try { - \OC::$server->getConfig()->setUserValue( $user, $app, $key, $value ); - } catch (\Exception $e) { - return false; - } - return true; - } -} diff --git a/tests/lib/PublicNamespace/OCPConfigTest.php b/tests/lib/PublicNamespace/OCPConfigTest.php deleted file mode 100644 index 44fd234735..0000000000 --- a/tests/lib/PublicNamespace/OCPConfigTest.php +++ /dev/null @@ -1,38 +0,0 @@ -. - */ - -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 16d03b049f..037736bf00 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); } From 647ce91395afcc907b5026724b52dbb5cf5c80cc Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Sat, 13 Jan 2018 14:31:07 +0100 Subject: [PATCH 2/2] Update autoloader Signed-off-by: Roeland Jago Douma --- lib/composer/composer/autoload_classmap.php | 1 - lib/composer/composer/autoload_static.php | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index f392e55037..a6160c0303 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -87,7 +87,6 @@ return array( 'OCP\\Comments\\IllegalIDChangeException' => $baseDir . '/lib/public/Comments/IllegalIDChangeException.php', 'OCP\\Comments\\MessageTooLongException' => $baseDir . '/lib/public/Comments/MessageTooLongException.php', 'OCP\\Comments\\NotFoundException' => $baseDir . '/lib/public/Comments/NotFoundException.php', - 'OCP\\Config' => $baseDir . '/lib/public/Config.php', 'OCP\\Console\\ConsoleEvent' => $baseDir . '/lib/public/Console/ConsoleEvent.php', 'OCP\\Constants' => $baseDir . '/lib/public/Constants.php', 'OCP\\Contacts' => $baseDir . '/lib/public/Contacts.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 6828f70674..79e73326f7 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -117,7 +117,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Comments\\IllegalIDChangeException' => __DIR__ . '/../../..' . '/lib/public/Comments/IllegalIDChangeException.php', 'OCP\\Comments\\MessageTooLongException' => __DIR__ . '/../../..' . '/lib/public/Comments/MessageTooLongException.php', 'OCP\\Comments\\NotFoundException' => __DIR__ . '/../../..' . '/lib/public/Comments/NotFoundException.php', - 'OCP\\Config' => __DIR__ . '/../../..' . '/lib/public/Config.php', 'OCP\\Console\\ConsoleEvent' => __DIR__ . '/../../..' . '/lib/public/Console/ConsoleEvent.php', 'OCP\\Constants' => __DIR__ . '/../../..' . '/lib/public/Constants.php', 'OCP\\Contacts' => __DIR__ . '/../../..' . '/lib/public/Contacts.php',