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/dav/tests/unit/Connector/LegacyPublicAuthTest.php

@@ -15,16 +15,12 @@
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
-/**
- * Class LegacyPublicAuthTest
- *
- *
- * @package OCA\DAV\Tests\unit\Connector
- */
-#[\PHPUnit\Framework\Attributes\Group('DB')]
-class LegacyPublicAuthTest extends \Test\TestCase {
+#[Group('DB')]
+class LegacyPublicAuthTest extends TestCase {
 	private ISession&MockObject $session;
 	private IRequest&MockObject $request;
 	private IManager&MockObject $shareManager;
@@ -55,7 +51,7 @@ protected function tearDown(): void {
 		\OC_User::setIncognitoMode(false);
 
 		// Set old user
-		\OC_User::setUserId($this->oldUser);
+		\OC_User::setUserId($this->oldUser ?: null);
 		if ($this->oldUser !== false) {
 			\OC_Util::setupFS($this->oldUser);
 		}

apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php

@@ -78,7 +78,7 @@ public function testGetPrincipalsByPrefixWithoutPrefix(): void {
 	}
 
 	public function testGetPrincipalsByPrefixWithUsers(): void {
-		$fooUser = $this->createMock(User::class);
+		$fooUser = $this->createMock(IUser::class);
 		$fooUser
 			->expects($this->once())
 			->method('getUID')
@@ -91,7 +91,7 @@ public function testGetPrincipalsByPrefixWithUsers(): void {
 			->expects($this->once())
 			->method('getSystemEMailAddress')
 			->willReturn('');
-		$barUser = $this->createMock(User::class);
+		$barUser = $this->createMock(IUser::class);
 		$barUser
 			->expects($this->once())
 			->method('getUID')
@@ -183,7 +183,7 @@ public function testGetPrincipalsByPrefixEmpty(): void {
 	}
 
 	public function testGetPrincipalsByPathWithoutMail(): void {
-		$fooUser = $this->createMock(User::class);
+		$fooUser = $this->createMock(IUser::class);
 		$fooUser
 			->expects($this->once())
 			->method('getUID')
@@ -211,7 +211,7 @@ public function testGetPrincipalsByPathWithoutMail(): void {
 	}
 
 	public function testGetPrincipalsByPathWithMail(): void {
-		$fooUser = $this->createMock(User::class);
+		$fooUser = $this->createMock(IUser::class);
 		$fooUser
 			->expects($this->once())
 			->method('getSystemEMailAddress')

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,28 @@
 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\Server;
 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 +142,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 (): IProvider {
+			return Server::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 (): Manager {
+			return  Server::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(),
+				Server::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/settings/lib/Middleware/SubadminMiddleware.php

@@ -19,9 +19,10 @@
 use OCP\Group\ISubAdmin;
 use OCP\IL10N;
 use OCP\IUserSession;
+use Override;
 
 /**
- * Verifies whether an user has at least subadmin rights.
+ * Verifies whether a user has at least sub-admin rights.
  * To bypass use the `@NoSubAdminRequired` annotation
  */
 class SubadminMiddleware extends Middleware {
@@ -41,29 +42,17 @@ private function isSubAdmin(): bool {
 		return $this->subAdminManager->isSubAdmin($userObject);
 	}
 
-	/**
-	 * Check if sharing is enabled before the controllers is executed
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws \Exception
-	 */
-	public function beforeController($controller, $methodName) {
+	#[Override]
+	public function beforeController(Controller $controller, string $methodName): void {
 		if (!$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->reflector->hasAnnotation('AuthorizedAdminSetting')) {
 			if (!$this->isSubAdmin()) {
 				throw new NotAdminException($this->l10n->t('Logged in account must be a sub admin'));
 			}
 		}
 	}
 
-	/**
-	 * Return 403 page in case of an exception
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @return TemplateResponse
-	 * @throws \Exception
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
+	#[Override]
+	public function afterException(Controller $controller, string $methodName, \Exception $exception): TemplateResponse {
 		if ($exception instanceof NotAdminException) {
 			$response = new TemplateResponse('core', '403', [], 'guest');
 			$response->setStatus(Http::STATUS_FORBIDDEN);

build/psalm-baseline.xml

@@ -2336,31 +2336,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>
-    </DeprecatedMethod>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getSettingsManager]]></code>
-    </UndefinedInterfaceMethod>
-  </file>
   <file src="apps/settings/lib/BackgroundJobs/VerifyUserData.php">
     <DeprecatedConstant>
       <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code>
@@ -4069,16 +4044,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/composer/composer/autoload_classmap.php

@@ -2122,7 +2122,6 @@
     'OC\\Share20\\UserDeletedListener' => $baseDir . '/lib/private/Share20/UserDeletedListener.php',
     'OC\\Share20\\UserRemovedListener' => $baseDir . '/lib/private/Share20/UserRemovedListener.php',
     'OC\\Share\\Constants' => $baseDir . '/lib/private/Share/Constants.php',
-    'OC\\Share\\Helper' => $baseDir . '/lib/private/Share/Helper.php',
     'OC\\Share\\Share' => $baseDir . '/lib/private/Share/Share.php',
     'OC\\Snowflake\\APCuSequence' => $baseDir . '/lib/private/Snowflake/APCuSequence.php',
     'OC\\Snowflake\\Decoder' => $baseDir . '/lib/private/Snowflake/Decoder.php',

lib/composer/composer/autoload_static.php

@@ -2163,7 +2163,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Share20\\UserDeletedListener' => __DIR__ . '/../../..' . '/lib/private/Share20/UserDeletedListener.php',
         'OC\\Share20\\UserRemovedListener' => __DIR__ . '/../../..' . '/lib/private/Share20/UserRemovedListener.php',
         'OC\\Share\\Constants' => __DIR__ . '/../../..' . '/lib/private/Share/Constants.php',
-        'OC\\Share\\Helper' => __DIR__ . '/../../..' . '/lib/private/Share/Helper.php',
         'OC\\Share\\Share' => __DIR__ . '/../../..' . '/lib/private/Share/Share.php',
         'OC\\Snowflake\\APCuSequence' => __DIR__ . '/../../..' . '/lib/private/Snowflake/APCuSequence.php',
         'OC\\Snowflake\\Decoder' => __DIR__ . '/../../..' . '/lib/private/Snowflake/Decoder.php',

lib/private/NavigationManager.php

@@ -22,17 +22,15 @@
 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 {