From 203e35bf8fb27dcf776adcf2ad9349dcdcd0e727 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 7 Apr 2017 16:24:56 -0500 Subject: [PATCH 1/2] Fix hinting to public class Signed-off-by: Morris Jobke --- templates/wizard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/wizard.php b/templates/wizard.php index 1e4258933..769a8f6a6 100644 --- a/templates/wizard.php +++ b/templates/wizard.php @@ -2,7 +2,7 @@ /** * @var array $_ * @var \OCP\IL10N $l - * @var \OC_Defaults $theme + * @var \OCP\Defaults $theme */ ?>
From 49283a8f3358e37f461a462cd884db7ff5153af9 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 7 Apr 2017 16:40:11 -0500 Subject: [PATCH 2/2] Do not rely on private namespace Signed-off-by: Morris Jobke --- lib/Controller/WizardController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Controller/WizardController.php b/lib/Controller/WizardController.php index d62307bfe..8b92e86be 100644 --- a/lib/Controller/WizardController.php +++ b/lib/Controller/WizardController.php @@ -25,6 +25,7 @@ use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\Defaults; use OCP\IConfig; use OCP\IRequest; @@ -63,7 +64,8 @@ public function disable() { * @return TemplateResponse */ public function show() { - $theming = \OC::$server->getThemingDefaults(); + /** @var Defaults $theming */ + $theming = \OC::$server->query(Defaults::class); return new TemplateResponse('firstrunwizard', 'wizard', [ 'desktop' => $this->config->getSystemValue('customclient_desktop', $theming->getSyncClientUrl()), 'android' => $this->config->getSystemValue('customclient_android', $theming->getAndroidClientUrl()),