summaryrefslogtreecommitdiffstats
path: root/lib/private/Settings/Admin
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-08-15 16:24:56 +0200
committerLukas Reschke <lukas@statuscode.ch>2016-08-15 16:25:34 +0200
commit8a7a0f328746230dd896ccc53b3ada271a91b930 (patch)
treeaaaaedf7167b74c48a91c90671f705edb71bc541 /lib/private/Settings/Admin
parent75a73a5a7301f203a962a17f6b2b8b90078c1884 (diff)
downloadnextcloud-server-8a7a0f328746230dd896ccc53b3ada271a91b930.tar.gz
nextcloud-server-8a7a0f328746230dd896ccc53b3ada271a91b930.zip
Add unit tests
Diffstat (limited to 'lib/private/Settings/Admin')
-rw-r--r--lib/private/Settings/Admin/Additional.php4
-rw-r--r--lib/private/Settings/Admin/Encryption.php4
-rw-r--r--lib/private/Settings/Admin/Logging.php3
-rw-r--r--lib/private/Settings/Admin/Server.php15
-rw-r--r--lib/private/Settings/Admin/Sharing.php8
-rw-r--r--lib/private/Settings/Admin/TipsTricks.php3
6 files changed, 29 insertions, 8 deletions
diff --git a/lib/private/Settings/Admin/Additional.php b/lib/private/Settings/Admin/Additional.php
index 106f0f65b8a..d133e4737a7 100644
--- a/lib/private/Settings/Admin/Additional.php
+++ b/lib/private/Settings/Admin/Additional.php
@@ -36,10 +36,12 @@ use OCP\Lock\ILockingProvider;
use OCP\Settings\ISettings;
class Additional implements ISettings {
-
/** @var IConfig */
private $config;
+ /**
+ * @param IConfig $config
+ */
public function __construct(IConfig $config) {
$this->config = $config;
}
diff --git a/lib/private/Settings/Admin/Encryption.php b/lib/private/Settings/Admin/Encryption.php
index ceae5aa6d3f..69c6bd17f03 100644
--- a/lib/private/Settings/Admin/Encryption.php
+++ b/lib/private/Settings/Admin/Encryption.php
@@ -35,6 +35,10 @@ class Encryption implements ISettings {
/** @var IUserManager */
private $userManager;
+ /**
+ * @param Manager $manager
+ * @param IUserManager $userManager
+ */
public function __construct(Manager $manager, IUserManager $userManager) {
$this->manager = $manager;
$this->userManager = $userManager;
diff --git a/lib/private/Settings/Admin/Logging.php b/lib/private/Settings/Admin/Logging.php
index 3097070577d..407248ac4b1 100644
--- a/lib/private/Settings/Admin/Logging.php
+++ b/lib/private/Settings/Admin/Logging.php
@@ -32,6 +32,9 @@ class Logging implements ISettings {
/** @var IConfig */
private $config;
+ /**
+ * @param IConfig $config
+ */
public function __construct(IConfig $config) {
$this->config = $config;
}
diff --git a/lib/private/Settings/Admin/Server.php b/lib/private/Settings/Admin/Server.php
index 20c3a6d7557..6b381ab48ed 100644
--- a/lib/private/Settings/Admin/Server.php
+++ b/lib/private/Settings/Admin/Server.php
@@ -36,20 +36,25 @@ use OCP\Lock\ILockingProvider;
use OCP\Settings\ISettings;
class Server implements ISettings {
-
/** @var IDBConnection|Connection */
private $db;
-
/** @var IConfig */
private $config;
-
/** @var ILockingProvider */
private $lockingProvider;
-
/** @var IL10N */
private $l;
- public function __construct(IDBConnection $db, IConfig $config, ILockingProvider $lockingProvider, IL10N $l) {
+ /**
+ * @param IDBConnection $db
+ * @param IConfig $config
+ * @param ILockingProvider $lockingProvider
+ * @param IL10N $l
+ */
+ public function __construct(IDBConnection $db,
+ IConfig $config,
+ ILockingProvider $lockingProvider,
+ IL10N $l) {
$this->db = $db;
$this->config = $config;
$this->lockingProvider = $lockingProvider;
diff --git a/lib/private/Settings/Admin/Sharing.php b/lib/private/Settings/Admin/Sharing.php
index d186dbed981..e110a3d81b7 100644
--- a/lib/private/Settings/Admin/Sharing.php
+++ b/lib/private/Settings/Admin/Sharing.php
@@ -31,6 +31,9 @@ class Sharing implements ISettings {
/** @var IConfig */
private $config;
+ /**
+ * @param IConfig $config
+ */
public function __construct(IConfig $config) {
$this->config = $config;
}
@@ -39,8 +42,9 @@ class Sharing implements ISettings {
* @return TemplateResponse
*/
public function getForm() {
- $excludeGroupsList = !is_null(json_decode($this->config->getAppValue('core', 'shareapi_exclude_groups_list', '')))
- ? implode('|', $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '')) : '';
+ $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+ $excludeGroupsList = !is_null(json_decode($excludedGroups))
+ ? implode('|', json_decode($excludedGroups, true)) : '';
$parameters = [
// Built-In Sharing
diff --git a/lib/private/Settings/Admin/TipsTricks.php b/lib/private/Settings/Admin/TipsTricks.php
index 217ddacd443..fd0fd595844 100644
--- a/lib/private/Settings/Admin/TipsTricks.php
+++ b/lib/private/Settings/Admin/TipsTricks.php
@@ -31,6 +31,9 @@ class TipsTricks implements ISettings {
/** @var IConfig */
private $config;
+ /**
+ * @param IConfig $config
+ */
public function __construct(IConfig $config) {
$this->config = $config;
}