Commit a32c71d2 authored by Vincent Petry's avatar Vincent Petry
Browse files

Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"

This reverts commit 012016d3.
parent f4dc9e6b
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
*/ */
namespace OC; namespace OC;
use OCP\IAppConfig;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\PreConditionNotMetException; use OCP\PreConditionNotMetException;
...@@ -41,9 +39,6 @@ class AllConfig implements \OCP\IConfig { ...@@ -41,9 +39,6 @@ class AllConfig implements \OCP\IConfig {
/** @var IDBConnection */ /** @var IDBConnection */
private $connection; private $connection;
/** @var IAppConfig */
private $appConfig;
/** /**
* 3 dimensional array with the following structure: * 3 dimensional array with the following structure:
* [ $userId => * [ $userId =>
...@@ -85,17 +80,11 @@ class AllConfig implements \OCP\IConfig { ...@@ -85,17 +80,11 @@ class AllConfig implements \OCP\IConfig {
* *
* otherwise a SQLite database is created in the wrong directory * otherwise a SQLite database is created in the wrong directory
* because the database connection was created with an uninitialized config * because the database connection was created with an uninitialized config
*
* The same applies for the app config, because it uses the database
* connection itself
*/ */
private function fixDIInit() { private function fixDIInit() {
if($this->connection === null) { if($this->connection === null) {
$this->connection = \OC::$server->getDatabaseConnection(); $this->connection = \OC::$server->getDatabaseConnection();
} }
if ($this->appConfig === null) {
$this->appConfig = \OC::$server->getAppConfig();
}
} }
/** /**
...@@ -145,10 +134,7 @@ class AllConfig implements \OCP\IConfig { ...@@ -145,10 +134,7 @@ class AllConfig implements \OCP\IConfig {
* @return string[] the keys stored for the app * @return string[] the keys stored for the app
*/ */
public function getAppKeys($appName) { public function getAppKeys($appName) {
// TODO - FIXME return \OC::$server->getAppConfig()->getKeys($appName);
$this->fixDIInit();
return $this->appConfig->getKeys($appName);
} }
/** /**
...@@ -159,24 +145,7 @@ class AllConfig implements \OCP\IConfig { ...@@ -159,24 +145,7 @@ class AllConfig implements \OCP\IConfig {
* @param string $value the value that should be stored * @param string $value the value that should be stored
*/ */
public function setAppValue($appName, $key, $value) { public function setAppValue($appName, $key, $value) {
// TODO - FIXME \OC::$server->getAppConfig()->setValue($appName, $key, $value);
$this->fixDIInit();
$this->appConfig->setValue($appName, $key, $value);
}
/**
* Checks if a key is set in the apps config
*
* @param string $appName the appName tto look a key up
* @param string $key the key to look up
* @return bool
*/
public function hasAppKey($appName, $key) {
// TODO - FIXME
$this->fixDIInit();
$this->appConfig->hasKey($appName, $key);
} }
/** /**
...@@ -188,49 +157,7 @@ class AllConfig implements \OCP\IConfig { ...@@ -188,49 +157,7 @@ class AllConfig implements \OCP\IConfig {
* @return string the saved value * @return string the saved value
*/ */
public function getAppValue($appName, $key, $default = '') { public function getAppValue($appName, $key, $default = '') {
// TODO - FIXME return \OC::$server->getAppConfig()->getValue($appName, $key, $default);
$this->fixDIInit();
return $this->appConfig->getValue($appName, $key, $default);
}
/**
* Get all app values that are stored
*
* @param string $appName the appName
* @return array with key - value pair as they are saved previously
*/
public function getAppValuesByApp($appName) {
// TODO - FIXME
$this->fixDIInit();
return $this->appConfig->getValues($appName, false);
}
/**
* Get all app values that use the same key
*
* @param string $key the appName
* @return array with key - value pair as they are saved previously with the
* app name as key
*/
public function getAppValuesByKey($key) {
// TODO - FIXME
$this->fixDIInit();
return $this->appConfig->getValues(false, $key);
}
/**
* Get all apps that have at least one value saved
*
* @return array containing app names
*/
public function getApps() {
// TODO - FIXME
$this->fixDIInit();
return $this->appConfig->getApps();
} }
/** /**
...@@ -240,10 +167,7 @@ class AllConfig implements \OCP\IConfig { ...@@ -240,10 +167,7 @@ class AllConfig implements \OCP\IConfig {
* @param string $key the key of the value, under which it was saved * @param string $key the key of the value, under which it was saved
*/ */
public function deleteAppValue($appName, $key) { public function deleteAppValue($appName, $key) {
// TODO - FIXME \OC::$server->getAppConfig()->deleteKey($appName, $key);
$this->fixDIInit();
$this->appConfig->deleteKey($appName, $key);
} }
/** /**
...@@ -252,10 +176,7 @@ class AllConfig implements \OCP\IConfig { ...@@ -252,10 +176,7 @@ class AllConfig implements \OCP\IConfig {
* @param string $appName the appName the configs are stored under * @param string $appName the appName the configs are stored under
*/ */
public function deleteAppValues($appName) { public function deleteAppValues($appName) {
// TODO - FIXME \OC::$server->getAppConfig()->deleteApp($appName);
$this->fixDIInit();
$this->appConfig->deleteApp($appName);
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* This class provides an easy way for apps to store config values in the * This class provides an easy way for apps to store config values in the
* database. * database.
* *
* @deprecated use \OC::$server->getConfig() to get an \OCP\IConfig instance * @deprecated use \OC::$server->getAppConfig() to get an \OCP\IAppConfig instance
*/ */
class OC_Appconfig { class OC_Appconfig {
/** /**
......
...@@ -27,10 +27,6 @@ namespace OCP; ...@@ -27,10 +27,6 @@ namespace OCP;
/** /**
* This class provides an easy way for apps to store config values in the * This class provides an easy way for apps to store config values in the
* database. * database.
*
* @deprecated This interface will be dropped with ownCloud 10.1 which will be
* released in the first quarter of 2017. Use the methods of
* \OCP\IConfig instead
*/ */
interface IAppConfig { interface IAppConfig {
/** /**
...@@ -38,7 +34,6 @@ interface IAppConfig { ...@@ -38,7 +34,6 @@ interface IAppConfig {
* @param string $app * @param string $app
* @param string $key * @param string $key
* @return bool * @return bool
* @deprecated use method hasAppKey of \OCP\IConfig
*/ */
public function hasKey($app, $key); public function hasKey($app, $key);
...@@ -81,7 +76,6 @@ interface IAppConfig { ...@@ -81,7 +76,6 @@ interface IAppConfig {
* @param string|false $key * @param string|false $key
* @param string|false $app * @param string|false $app
* @return array|false * @return array|false
* @deprecated use method getAppValuesByApp or getAppValuesByKey of \OCP\IConfig
*/ */
public function getValues($app, $key); public function getValues($app, $key);
...@@ -100,7 +94,6 @@ interface IAppConfig { ...@@ -100,7 +94,6 @@ interface IAppConfig {
/** /**
* Get all apps using the config * Get all apps using the config
* @return array an array of app ids * @return array an array of app ids
* @deprecated use method getApps of \OCP\IConfig
* *
* This function returns a list of all apps that have at least one * This function returns a list of all apps that have at least one
* entry in the appconfig table. * entry in the appconfig table.
......
...@@ -89,16 +89,6 @@ interface IConfig { ...@@ -89,16 +89,6 @@ interface IConfig {
*/ */
public function setAppValue($appName, $key, $value); public function setAppValue($appName, $key, $value);
/**
* Checks if a key is set in the apps config
*
* @param string $appName the appName tto look a key up
* @param string $key the key to look up
* @return bool
* @since 8.1.0
*/
public function hasAppKey($appName, $key);
/** /**
* Looks up an app wide defined value * Looks up an app wide defined value
* *
...@@ -109,33 +99,6 @@ interface IConfig { ...@@ -109,33 +99,6 @@ interface IConfig {
*/ */
public function getAppValue($appName, $key, $default = ''); public function getAppValue($appName, $key, $default = '');
/**
* Get all app values that are stored
*
* @param string $appName the appName
* @return array with key - value pair as they are saved previously
* @since 8.1.0
*/
public function getAppValuesByApp($appName);
/**
* Get all app values that use the same key
*
* @param string $key the appName
* @return array with key - value pair as they are saved previously with the
* app name as key
* @since 8.1.0
*/
public function getAppValuesByKey($key);
/**
* Get all apps that have at least one value saved
*
* @return array containing app names
* @since 8.1.0
*/
public function getApps();
/** /**
* Delete an app wide defined value * Delete an app wide defined value
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment