chore: add override attribute

lib/Commands/UpdateStorageStats.php

@@ -26,6 +26,7 @@ public function __construct(StorageStatistics $storageStatistics) {
 		$this->storageStatistics = $storageStatistics;
 	}
 
+	#[\Override]
 	public function configure(): void {
 		parent::configure();
 		$this->setName('serverinfo:update-storage-statistics')

lib/Jobs/UpdateStorageStats.php

@@ -27,6 +27,7 @@ public function __construct(ITimeFactory $time, StorageStatistics $storageStatis
 	/**
 	 * @inheritDoc
 	 */
+	#[\Override]
 	protected function run($argument): void {
 		$this->storageStatistics->updateStorageCounts();
 	}

lib/OperatingSystems/Dummy.php

@@ -10,26 +10,32 @@
 use OCA\ServerInfo\Resources\Memory;
 
 class Dummy implements IOperatingSystem {
+	#[\Override]
 	public function supported(): bool {
 		return false;
 	}
 
+	#[\Override]
 	public function getMemory(): Memory {
 		return new Memory();
 	}
 
+	#[\Override]
 	public function getCpuName(): string {
 		return 'Unknown Processor';
 	}
 
+	#[\Override]
 	public function getTime(): string {
 		return '';
 	}
 
+	#[\Override]
 	public function getUptime(): int {
 		return -1;
 	}
 
+	#[\Override]
 	public function getNetworkInfo(): array {
 		return [
 			'hostname' => \gethostname(),
@@ -38,18 +44,22 @@ public function getNetworkInfo(): array {
 		];
 	}
 
+	#[\Override]
 	public function getNetworkInterfaces(): array {
 		return [];
 	}
 
+	#[\Override]
 	public function getDiskInfo(): array {
 		return [];
 	}
 
+	#[\Override]
 	public function getThermalZones(): array {
 		return [];
 	}
 
+	#[\Override]
 	public function getCpuCount(): int {
 		return 1;
 	}

lib/OperatingSystems/FreeBSD.php

@@ -16,10 +16,12 @@ class FreeBSD implements IOperatingSystem {
 	private const AF_INET = 2;
 	private const AF_INET6 = 28;
 
+	#[\Override]
 	public function supported(): bool {
 		return false;
 	}
 
+	#[\Override]
 	public function getMemory(): Memory {
 		$data = new Memory();
 
@@ -57,6 +59,7 @@ public function getMemory(): Memory {
 		return $data;
 	}
 
+	#[\Override]
 	public function getCpuName(): string {
 		$data = 'Unknown Processor';
 
@@ -75,6 +78,7 @@ public function getCpuName(): string {
 		return $data;
 	}
 
+	#[\Override]
 	public function getCpuCount(): int {
 		$numCpu = -1;
 
@@ -87,6 +91,7 @@ public function getCpuCount(): int {
 		return $numCpu;
 	}
 
+	#[\Override]
 	public function getTime(): string {
 		try {
 			return $this->executeCommand('date');
@@ -95,6 +100,7 @@ public function getTime(): string {
 		}
 	}
 
+	#[\Override]
 	public function getUptime(): int {
 		$uptime = -1;
 
@@ -109,6 +115,7 @@ public function getUptime(): int {
 		return $uptime;
 	}
 
+	#[\Override]
 	public function getNetworkInfo(): array {
 		$result = [
 			'gateway' => '',
@@ -128,6 +135,7 @@ public function getNetworkInfo(): array {
 		return $result;
 	}
 
+	#[\Override]
 	public function getNetworkInterfaces(): array {
 		$data = [];
 
@@ -185,6 +193,7 @@ public function getNetworkInterfaces(): array {
 		return $data;
 	}
 
+	#[\Override]
 	public function getDiskInfo(): array {
 		$data = [];
 
@@ -223,6 +232,7 @@ public function getDiskInfo(): array {
 		return $data;
 	}
 
+	#[\Override]
 	public function getThermalZones(): array {
 		return [];
 	}

lib/OperatingSystems/Linux.php

@@ -19,10 +19,12 @@ class Linux implements IOperatingSystem {
 	private const AF_INET = 2;
 	private const AF_INET6 = 10;
 
+	#[\Override]
 	public function supported(): bool {
 		return true;
 	}
 
+	#[\Override]
 	public function getMemory(): Memory {
 		$data = new Memory();
 
@@ -66,6 +68,7 @@ public function getMemory(): Memory {
 		return $data;
 	}
 
+	#[\Override]
 	public function getCpuName(): string {
 		$data = 'Unknown Processor';
 
@@ -103,6 +106,7 @@ public function getCpuName(): string {
 		return $data;
 	}
 
+	#[\Override]
 	public function getCpuCount(): int {
 		$numCpu = -1;
 
@@ -118,6 +122,7 @@ public function getCpuCount(): int {
 		return count($matches[1]);
 	}
 
+	#[\Override]
 	public function getTime(): string {
 		try {
 			return $this->executeCommand('date');
@@ -126,6 +131,7 @@ public function getTime(): string {
 		}
 	}
 
+	#[\Override]
 	public function getUptime(): int {
 		$data = -1;
 
@@ -140,6 +146,7 @@ public function getUptime(): int {
 		return $uptimeInSeconds;
 	}
 
+	#[\Override]
 	public function getNetworkInfo(): array {
 		$result = [
 			'gateway' => '',
@@ -153,6 +160,7 @@ public function getNetworkInfo(): array {
 		return $result;
 	}
 
+	#[\Override]
 	public function getNetworkInterfaces(): array {
 		$data = [];
 
@@ -202,6 +210,7 @@ public function getNetworkInterfaces(): array {
 		return $data;
 	}
 
+	#[\Override]
 	public function getDiskInfo(): array {
 		$data = [];
 
@@ -241,6 +250,7 @@ public function getDiskInfo(): array {
 		return $data;
 	}
 
+	#[\Override]
 	public function getThermalZones(): array {
 		$data = [];
 

lib/Os.php

@@ -22,6 +22,7 @@ public function __construct(IConfig $config) {
 		$this->backend = $this->getBackend($restrictedMode ? 'Dummy' : PHP_OS);
 	}
 
+	#[\Override]
 	public function supported(): bool {
 		return $this->backend->supported();
 	}
@@ -37,26 +38,32 @@ public function getOSName(): string {
 		return PHP_OS . ' ' . php_uname('r') . ' ' . php_uname('m');
 	}
 
+	#[\Override]
 	public function getMemory(): Memory {
 		return $this->backend->getMemory();
 	}
 
+	#[\Override]
 	public function getCpuName(): string {
 		return $this->backend->getCpuName();
 	}
 
+	#[\Override]
 	public function getCpuCount(): int {
 		return $this->backend->getCpuCount();
 	}
 
+	#[\Override]
 	public function getTime(): string {
 		return $this->backend->getTime();
 	}
 
+	#[\Override]
 	public function getUptime(): int {
 		return $this->backend->getUptime();
 	}
 
+	#[\Override]
 	public function getDiskInfo(): array {
 		return $this->backend->getDiskInfo();
 	}
@@ -83,14 +90,17 @@ public function getDiskData(): array {
 		return $data;
 	}
 
+	#[\Override]
 	public function getNetworkInfo(): array {
 		return $this->backend->getNetworkInfo();
 	}
 
+	#[\Override]
 	public function getNetworkInterfaces(): array {
 		return $this->backend->getNetworkInterfaces();
 	}
 
+	#[\Override]
 	public function getThermalZones(): array {
 		return $this->backend->getThermalZones();
 	}

lib/PhpInfoResponse.php

@@ -25,6 +25,7 @@ public function __construct() {
 		$this->setFeaturePolicy(new FeaturePolicy());
 	}
 
+	#[\Override]
 	public function render() {
 		ob_start();
 		phpinfo(INFO_ALL & ~INFO_ENVIRONMENT & ~INFO_VARIABLES);

lib/Resources/ThermalZone.php

@@ -31,6 +31,7 @@ public function getTemp(): float {
 		return $this->temp;
 	}
 
+	#[\Override]
 	public function jsonSerialize(): array {
 		return [
 			'zone' => $this->zone,

lib/Settings/AdminSection.php

@@ -26,6 +26,7 @@ public function __construct(IL10N $l, IURLGenerator $url) {
 	/**
 	 * returns the ID of the section. It is supposed to be a lower case string
 	 */
+	#[\Override]
 	public function getID(): string {
 		return 'serverinfo';
 	}
@@ -34,6 +35,7 @@ public function getID(): string {
 	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
 	 * integration'. Use the L10N service to translate it.
 	 */
+	#[\Override]
 	public function getName(): string {
 		return $this->l->t('System');
 	}
@@ -45,13 +47,15 @@ public function getName(): string {
 	 *
 	 * keep the server setting at the top, right after "overview" and "basic settings"
 	 */
+	#[\Override]
 	public function getPriority(): int {
 		return 90;
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
+	#[\Override]
 	public function getIcon(): string {
 		return $this->url->imagePath('serverinfo', 'app-dark.svg');
 	}

lib/Settings/AdminSettings.php

@@ -40,6 +40,7 @@ public function __construct(
 	) {
 	}
 
+	#[\Override]
 	public function getForm(): TemplateResponse {
 		$monitoringEndPoint = $this->urlGenerator->getAbsoluteURL('ocs/v2.php/apps/serverinfo/api/v1/info');
 		$params = [
@@ -69,6 +70,7 @@ public function getForm(): TemplateResponse {
 	/**
 	 * @return string the section ID, e.g. 'sharing'
 	 */
+	#[\Override]
 	public function getSection(): string {
 		return 'serverinfo';
 	}
@@ -80,6 +82,7 @@ public function getSection(): string {
 	 *
 	 * keep the server setting at the top, right after "server settings"
 	 */
+	#[\Override]
 	public function getPriority(): int {
 		return 0;
 	}

psalm.xml

@@ -16,12 +16,12 @@
 		<file name="tests/stub.phpstub" preloadClasses="true"/>
 	</stubs>
 	<projectFiles>
-		<directory name="lib" />
+		<directory name="lib"/>
 		<ignoreFiles>
-			<directory name="vendor" />
+			<directory name="vendor"/>
 		</ignoreFiles>
 	</projectFiles>
 	<extraFiles>
-		<directory name="vendor" />
+		<directory name="vendor"/>
 	</extraFiles>
 </psalm>

tests/bootstrap.php

@@ -5,14 +5,14 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
+use OCP\App\IAppManager;
+
 if (!defined('PHPUNIT_RUN')) {
 	define('PHPUNIT_RUN', 1);
 }
 
 require_once __DIR__ . '/../../../lib/base.php';
 
-if (!class_exists('\PHPUnit\Framework\TestCase')) {
-	require_once('PHPUnit/Autoload.php');
-}
-\OC_App::loadApp('serverinfo');
+\OC::$server->get(IAppManager::class)->loadApp('serverinfo');
 OC_Hook::clear();