refactor: Add more typing

- repairs job
- database
- redis

And remove Helpertest which was unused outside of some tests.

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/settings/lib/AppInfo/Application.php

@@ -11,7 +11,7 @@
 use OC\AppFramework\Utility\TimeFactory;
 use OC\Authentication\Events\AppPasswordCreatedEvent;
 use OC\Authentication\Token\IProvider;
-use OC\Server;
+use OC\Settings\Manager;
 use OCA\Settings\ConfigLexicon;
 use OCA\Settings\Hooks;
 use OCA\Settings\Listener\AppPasswordCreatedActivityListener;
@@ -84,25 +84,27 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\IAppContainer;
 use OCP\Defaults;
 use OCP\Group\Events\GroupDeletedEvent;
 use OCP\Group\Events\UserAddedEvent;
 use OCP\Group\Events\UserRemovedEvent;
-use OCP\IServerContainer;
+use OCP\IConfig;
+use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
+use OCP\Mail\IMailer;
+use OCP\Security\ICrypto;
+use OCP\Security\ISecureRandom;
 use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
 use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
 use OCP\Settings\IManager;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserChangedEvent;
 use OCP\Util;
+use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'settings';
 
-	/**
-	 * @param array $urlParams
-	 */
 	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
@@ -139,32 +141,23 @@ public function register(IRegistrationContext $context): void {
 		/**
 		 * Core class wrappers
 		 */
-		$context->registerService(IProvider::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->query(IProvider::class);
+		$context->registerService(IProvider::class, function (ContainerInterface $appContainer) {
+			return $appContainer->get(IProvider::class);
 		});
-		$context->registerService(IManager::class, function (IAppContainer $appContainer) {
-			/** @var IServerContainer $serverContainer */
-			$serverContainer = $appContainer->query(IServerContainer::class);
-			return $serverContainer->getSettingsManager();
+		$context->registerService(IManager::class, function (ContainerInterface $appContainer) {
+			return $appContainer->get(Manager::class);
 		});
 
-		$context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) {
-			/** @var Server $server */
-			$server = $appContainer->query(IServerContainer::class);
-			/** @var Defaults $defaults */
-			$defaults = $server->query(Defaults::class);
-
+		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $appContainer) {
 			return new NewUserMailHelper(
-				$defaults,
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
+				$appContainer->get(Defaults::class),
+				$appContainer->get(IURlGenerator::class),
+				$appContainer->get(IFactory::class),
+				$appContainer->get(IMailer::class),
+				$appContainer->get(ISecureRandom::class),
 				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
+				$appContainer->get(IConfig::class),
+				$appContainer->get(ICrypto::class),
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});

apps/user_ldap/lib/User/OfflineUser.php

@@ -101,7 +101,7 @@ public function getOCName() {
 	 * getter for LDAP uid
 	 * @return string
 	 */
-	public function getUID() {
+	public function getUID(): string {
 		if ($this->uid === null) {
 			$this->fetchDetails();
 		}

build/psalm-baseline.xml

@@ -2265,33 +2265,6 @@
       <code><![CDATA[Response]]></code>
     </InvalidReturnType>
   </file>
-  <file src="apps/settings/lib/AppInfo/Application.php">
-    <DeprecatedInterface>
-      <code><![CDATA[$serverContainer]]></code>
-      <code><![CDATA[$serverContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-      <code><![CDATA[IAppContainer]]></code>
-    </DeprecatedInterface>
-    <DeprecatedMethod>
-      <code><![CDATA[getConfig]]></code>
-      <code><![CDATA[getCrypto]]></code>
-      <code><![CDATA[getL10NFactory]]></code>
-      <code><![CDATA[getMailer]]></code>
-      <code><![CDATA[getSecureRandom]]></code>
-      <code><![CDATA[getURLGenerator]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-      <code><![CDATA[query]]></code>
-    </DeprecatedMethod>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getSettingsManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="apps/settings/lib/BackgroundJobs/VerifyUserData.php">
     <DeprecatedConstant>
       <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code>
@@ -3935,16 +3908,6 @@
       <code><![CDATA[array]]></code>
     </ImplementedReturnTypeMismatch>
   </file>
-  <file src="lib/private/Remote/Instance.php">
-    <InvalidScalarArgument>
-      <code><![CDATA[$response]]></code>
-    </InvalidScalarArgument>
-  </file>
-  <file src="lib/private/Repair/Owncloud/CleanPreviews.php">
-    <InvalidArgument>
-      <code><![CDATA[false]]></code>
-    </InvalidArgument>
-  </file>
   <file src="lib/private/Repair/RemoveLinkShares.php">
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$this->userToNotify]]></code>

core/Command/Memcache/RedisCommand.php

@@ -44,7 +44,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
-		$redis->setOption(\Redis::OPT_REPLY_LITERAL, true);
+		if ($redis instanceof \Redis) {
+			$redis->setOption(\Redis::OPT_REPLY_LITERAL, true);
+		}
 		$result = $redis->rawCommand(...$command);
 		if ($result === false) {
 			$output->writeln('<error>Redis command failed</error>');

lib/private/NavigationManager.php

@@ -22,17 +22,16 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Manages the ownCloud navigation
+ * Manages the nextcloud navigation
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
+	protected array $entries = [];
+	protected array $closureEntries = [];
+	/** @var string $activeEntry */
 	protected $activeEntry;
-	protected $unreadCounters = [];
-
-	/** @var bool */
-	protected $init = false;
+	protected array $unreadCounters = [];
+	protected bool $init = false;
 	/** User defined app order (cached for the `add` function) */
 	private array $customAppOrder;
 

lib/private/Preview/WatcherConnector.php

@@ -16,6 +16,8 @@
 use OCP\Server;
 
 class WatcherConnector {
+	private ?Watcher $watcher = null;
+
 	public function __construct(
 		private IRootFolder $root,
 		private SystemConfig $config,
@@ -24,7 +26,11 @@ public function __construct(
 	}
 
 	private function getWatcher(): Watcher {
-		return Server::get(Watcher::class);
+		if ($this->watcher !== null) {
+			return $this->watcher;
+		}
+		$this->watcher = Server::get(Watcher::class);
+		return $this->watcher;
 	}
 
 	public function connectWatcher(): void {

lib/private/RedisFactory.php

@@ -13,21 +13,15 @@ class RedisFactory {
 	public const REDIS_MINIMAL_VERSION = '4.0.0';
 	public const REDIS_EXTRA_PARAMETERS_MINIMAL_VERSION = '5.3.0';
 
-	/** @var \Redis|\RedisCluster */
-	private $instance;
+	private \Redis|\RedisCluster|null $instance = null;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
 	public function __construct(
 		private SystemConfig $config,
 		private IEventLogger $eventLogger,
 	) {
 	}
 
-	private function create() {
+	private function create(): void {
 		$isCluster = in_array('redis.cluster', $this->config->getKeys(), true);
 		$config = $isCluster
 			? $this->config->getValue('redis.cluster', [])
@@ -121,10 +115,9 @@ private function create() {
 	 * Get the ssl context config
 	 *
 	 * @param array $config the current config
-	 * @return array|null
 	 * @throws \UnexpectedValueException
 	 */
-	private function getSslContext($config) {
+	private function getSslContext(array $config): ?array {
 		if (isset($config['ssl_context'])) {
 			if (!$this->isConnectionParametersSupported()) {
 				throw new \UnexpectedValueException(\sprintf(
@@ -137,14 +130,18 @@ private function getSslContext($config) {
 		return null;
 	}
 
-	public function getInstance() {
+	public function getInstance(): \Redis|\RedisCluster {
 		if (!$this->isAvailable()) {
 			throw new \Exception('Redis support is not available');
 		}
-		if (!$this->instance instanceof \Redis) {
+		if ($this->instance === null) {
 			$this->create();
 		}
 
+		if ($this->instance === null) {
+			throw new \Exception('Redis support is not available');
+		}
+
 		return $this->instance;
 	}
 

lib/private/Remote/Instance.php

@@ -10,77 +10,54 @@
 use OCP\Http\Client\IClientService;
 use OCP\ICache;
 use OCP\Remote\IInstance;
+use Override;
 
 /**
  * Provides some basic info about a remote Nextcloud instance
  */
 class Instance implements IInstance {
-	/** @var string */
-	private $url;
+	private string $url;
+	private ?array $status = null;
 
-	/** @var array|null */
-	private $status;
-
-	/**
-	 * @param string $url
-	 * @param ICache $cache
-	 * @param IClientService $clientService
-	 */
 	public function __construct(
-		$url,
+		string $url,
 		private ICache $cache,
 		private IClientService $clientService,
 	) {
 		$url = str_replace('https://', '', $url);
 		$this->url = str_replace('http://', '', $url);
 	}
 
-	/**
-	 * @return string The url of the remote server without protocol
-	 */
-	public function getUrl() {
+	#[Override]
+	public function getUrl(): string {
 		return $this->url;
 	}
 
-	/**
-	 * @return string The of the remote server with protocol
-	 */
-	public function getFullUrl() {
+	#[Override]
+	public function getFullUrl(): string {
 		return $this->getProtocol() . '://' . $this->getUrl();
 	}
 
-	/**
-	 * @return string The full version string in '13.1.2.3' format
-	 */
-	public function getVersion() {
+	#[Override]
+	public function getVersion(): string {
 		$status = $this->getStatus();
 		return $status['version'];
 	}
 
-	/**
-	 * @return string 'http' or 'https'
-	 */
-	public function getProtocol() {
+	#[Override]
+	public function getProtocol(): string {
 		$status = $this->getStatus();
 		return $status['protocol'];
 	}
 
-	/**
-	 * Check that the remote server is installed and not in maintenance mode
-	 *
-	 * @return bool
-	 */
-	public function isActive() {
+	#[Override]
+	public function isActive(): bool {
 		$status = $this->getStatus();
 		return $status['installed'] && !$status['maintenance'];
 	}
 
-	/**
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	private function getStatus() {
+	#[Override]
+	private function getStatus(): array {
 		if ($this->status) {
 			return $this->status;
 		}
@@ -113,11 +90,7 @@ private function getStatus() {
 		return $status;
 	}
 
-	/**
-	 * @param string $url
-	 * @return bool|string
-	 */
-	private function downloadStatus($url) {
+	private function downloadStatus(string $url): false|string {
 		try {
 			$request = $this->clientService->newClient()->get($url);
 			$content = $request->getBody();
@@ -127,7 +100,7 @@ private function downloadStatus($url) {
 			assert(is_string($content));
 
 			return $content;
-		} catch (\Exception $e) {
+		} catch (\Exception) {
 			return false;
 		}
 	}