mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup the Settings class 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-08-26 10:21:26 +02:00
parent 9b89baca14
commit db968cb1d4
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
settings/Settings/Admin/Server.php
View File

@ -26,48 +26,19 @@
namespace OC\Settings\Admin;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DBALException;
use Doctrine\DBAL\Platforms\SqlitePlatform;
use OC\Lock\DBLockingProvider;
use OC\Lock\NoopLockingProvider;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IRequest;
use OCP\Lock\ILockingProvider;
use OCP\Settings\ISettings;
class Server implements ISettings {
/** @var IDBConnection|Connection */
private $db;
/** @var IRequest */
private $request;
/** @var IConfig */
private $config;
/** @var ILockingProvider */
private $lockingProvider;
/** @var IL10N */
private $l;
/**
* @param IDBConnection $db
* @param IRequest $request
* @param IConfig $config
* @param ILockingProvider $lockingProvider
* @param IL10N $l
*/
public function __construct(IDBConnection $db,
IRequest $request,
IConfig $config,
ILockingProvider $lockingProvider,
IL10N $l) {
$this->db = $db;
$this->request = $request;
public function __construct(IConfig $config) {
$this->config = $config;
$this->lockingProvider = $lockingProvider;
$this->l = $l;
}
/**
@ -89,7 +60,7 @@ class Server implements ISettings {
/**
* @return string the section ID, e.g. 'sharing'
*/
public function getSection() {
public function getSection(): string {
return 'server';
}
@ -100,7 +71,7 @@ class Server implements ISettings {
*
* E.g.: 70
*/
public function getPriority() {
public function getPriority(): int {
return 0;
}
}

25
tests/lib/Settings/Admin/ServerTest.php
View File

@ -23,44 +23,23 @@
namespace Test\Settings\Admin;
use Doctrine\DBAL\Platforms\SqlitePlatform;
use OC\Settings\Admin\Server;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IRequest;
use OCP\Lock\ILockingProvider;
use Test\TestCase;
class ServerTest extends TestCase {
/** @var Server */
private $admin;
/** @var IDBConnection */
private $dbConnection;
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
/** @var IConfig */
private $config;
/** @var ILockingProvider */
private $lockingProvider;
/** @var IL10N */
private $l10n;
public function setUp() {
parent::setUp();
$this->config = $this->getMockBuilder(IConfig::class)->getMock();
$this->request = $this->createMock(IRequest::class);
$this->dbConnection = $this->getMockBuilder('\OCP\IDBConnection')->getMock();
$this->lockingProvider = $this->getMockBuilder('\OCP\Lock\ILockingProvider')->getMock();
$this->l10n = $this->getMockBuilder(IL10N::class)->getMock();
$this->config = $this->createMock(IConfig::class);
$this->admin = new Server(
$this->dbConnection,
$this->request,
$this->config,
$this->lockingProvider,
$this->l10n
$this->config
);
}