1 files changed, 22 insertions, 64 deletions

diff --git a/apps/settings/lib/Settings/Personal/ServerDevNotice.php b/apps/settings/lib/Settings/Personal/ServerDevNotice.php
index 1c1c870d8e9..c9993484abd 100644
--- a/apps/settings/lib/Settings/Personal/ServerDevNotice.php
+++ b/apps/settings/lib/Settings/Personal/ServerDevNotice.php
@@ -1,29 +1,9 @@
 <?php
+
 /**
- * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Jan C. Borchardt <hey@jancborchardt.net>
- * @author Julius Härtl <jus@bitgrid.net>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace OCA\Settings\Settings\Personal;
 
 use OCA\Viewer\Event\LoadViewer;
@@ -39,51 +19,29 @@ use OCP\Util;
 
 class ServerDevNotice implements ISettings {
 
-	/** @var IRegistry */
-	private $registry;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IInitialState */
-	private $initialState;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	public function __construct(IRegistry $registry,
-								IEventDispatcher $eventDispatcher,
-								IRootFolder $rootFolder,
-								IUserSession $userSession,
-								IInitialState $initialState,
-								IURLGenerator $urlGenerator) {
-		$this->registry = $registry;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->initialState = $initialState;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IRegistry $registry,
+		private IEventDispatcher $eventDispatcher,
+		private IRootFolder $rootFolder,
+		private IUserSession $userSession,
+		private IInitialState $initialState,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
 	/**
 	 * @return TemplateResponse
 	 */
-	public function getForm() {
+	public function getForm(): TemplateResponse {
 		$userFolder = $this->rootFolder->getUserFolder($this->userSession->getUser()->getUID());
 
 		$hasInitialState = false;
 
-		// viewer is default enabled and this makes a zero-cost assertion for Psalm
-		assert(class_exists(LoadViewer::class));
-
-		// If the Reasons to use Nextcloud.pdf file is here, let's init Viewer
-		if ($userFolder->nodeExists('Reasons to use Nextcloud.pdf')) {
+		// If the Reasons to use Nextcloud.pdf file is here, let's init Viewer, also check that Viewer is there
+		if (class_exists(LoadViewer::class) && $userFolder->nodeExists('Reasons to use Nextcloud.pdf')) {
+			/**
+			 * @psalm-suppress UndefinedClass, InvalidArgument
+			 */
 			$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 			$hasInitialState = true;
 		}
@@ -98,9 +56,9 @@ class ServerDevNotice implements ISettings {
 	}
 
 	/**
-	 * @return string the section ID, e.g. 'sharing'
+	 * @return string|null the section ID, e.g. 'sharing'
 	 */
-	public function getSection() {
+	public function getSection(): ?string {
 		if ($this->registry->delegateHasValidSubscription()) {
 			return null;
 		}
@@ -110,12 +68,12 @@ class ServerDevNotice implements ISettings {
 
 	/**
 	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
+	 *             the admin section. The forms are arranged in ascending order of the
+	 *             priority values. It is required to return a value between 0 and 100.
 	 *
 	 * E.g.: 70
 	 */
-	public function getPriority() {
+	public function getPriority(): int {
 		return 1000;
 	}
 }