summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-17 16:37:48 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-03-19 15:53:49 -0600
commitedd55b0ea9c13273695bf95d913f4dfc03e08c95 (patch)
tree71bcb99c0d2b5fd16d97eadcc947e11488c23817 /core
parentc02527e41462133444881817b741f91ebf563b3b (diff)
downloadnextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.tar.gz
nextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.zip
Use SystemConfig instead of AllConfig for DB stuff
* preparation for followup PRs to clean up the DB bootstrapping Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'core')
-rw-r--r--core/Command/Check.php6
-rw-r--r--core/Command/Maintenance/Install.php6
-rw-r--r--core/register_command.php6
3 files changed, 9 insertions, 9 deletions
diff --git a/core/Command/Check.php b/core/Command/Check.php
index 8ced96a91c3..16176a171a2 100644
--- a/core/Command/Check.php
+++ b/core/Command/Check.php
@@ -23,17 +23,17 @@
*/
namespace OC\Core\Command;
-use OCP\IConfig;
+use OC\SystemConfig;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Check extends Base {
/**
- * @var IConfig
+ * @var SystemConfig
*/
private $config;
- public function __construct(IConfig $config) {
+ public function __construct(SystemConfig $config) {
parent::__construct();
$this->config = $config;
}
diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index 4b76a1f608c..86180489fa4 100644
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -29,7 +29,7 @@ namespace OC\Core\Command\Maintenance;
use InvalidArgumentException;
use OC\Setup;
-use OCP\IConfig;
+use OC\SystemConfig;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
@@ -40,11 +40,11 @@ use Symfony\Component\Console\Question\Question;
class Install extends Command {
/**
- * @var IConfig
+ * @var SystemConfig
*/
private $config;
- public function __construct(IConfig $config) {
+ public function __construct(SystemConfig $config) {
parent::__construct();
$this->config = $config;
}
diff --git a/core/register_command.php b/core/register_command.php
index 288ee9590b7..6a8ab2bebe2 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -35,7 +35,7 @@
/** @var $application Symfony\Component\Console\Application */
$application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
$application->add(new OC\Core\Command\Status);
-$application->add(new OC\Core\Command\Check(\OC::$server->getConfig()));
+$application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig()));
$infoParser = new \OC\App\InfoParser();
$application->add(new OC\Core\Command\App\CheckCode($infoParser));
$application->add(new OC\Core\Command\L10n\CreateJs());
@@ -83,7 +83,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
$application->add(new OC\Core\Command\Db\GenerateChangeScript());
- $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getConfig())));
+ $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
@@ -149,5 +149,5 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
} else {
- $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getConfig()));
+ $application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getSystemConfig()));
}