summaryrefslogtreecommitdiffstats
path: root/core/Controller/SetupController.php
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-09-02 12:05:51 +0200
committerGitHub <noreply@github.com>2022-09-02 12:05:51 +0200
commit2397ea72196de42a79e2a5873dcbb07db698f348 (patch)
treecfe0e7e4f6ec10a665eb0a40eae103bafc49203f /core/Controller/SetupController.php
parent046d5451b15d46581cde846676e0b6d631fedbb7 (diff)
parent30be6ad605f3e451c17de3df74ec3832e1758afe (diff)
downloadnextcloud-server-2397ea72196de42a79e2a5873dcbb07db698f348.tar.gz
nextcloud-server-2397ea72196de42a79e2a5873dcbb07db698f348.zip
Merge branch 'master' into fix/setting/accessibility-title
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'core/Controller/SetupController.php')
-rw-r--r--core/Controller/SetupController.php15
1 files changed, 5 insertions, 10 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index 620b4f12df7..ab8b1973bf2 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -35,10 +35,8 @@ use OC\Setup;
use OCP\ILogger;
class SetupController {
- /** @var Setup */
- protected $setupHelper;
- /** @var string */
- private $autoConfigFile;
+ protected Setup $setupHelper;
+ private string $autoConfigFile;
/**
* @param Setup $setupHelper
@@ -48,10 +46,7 @@ class SetupController {
$this->setupHelper = $setupHelper;
}
- /**
- * @param $post
- */
- public function run($post) {
+ public function run(array $post): void {
// Check for autosetup:
$post = $this->loadAutoConfig($post);
$opts = $this->setupHelper->getSystemInfo();
@@ -90,7 +85,7 @@ class SetupController {
\OC_Template::printGuestPage('', 'installation_forbidden');
}
- public function display($post) {
+ public function display($post): void {
$defaults = [
'adminlogin' => '',
'adminpass' => '',
@@ -122,7 +117,7 @@ class SetupController {
exit();
}
- public function loadAutoConfig($post) {
+ public function loadAutoConfig(array $post): array {
if (file_exists($this->autoConfigFile)) {
\OCP\Util::writeLog('core', 'Autoconfig file found, setting up Nextcloud…', ILogger::INFO);
$AUTOCONFIG = [];