chore: cs:fix

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Author: skjnldsv

composer.json

@@ -23,7 +23,7 @@
 		"psalm": "psalm --threads=1",
 		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
 		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
-		"psalm:fix": "psalm --alter --issues=UnnecessaryVarAnnotation,UnusedVariable,MissingReturnType,PossiblyUnusedMethod,MissingParamType,UnusedMethod",
+		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
 		"test:unit": "vendor/bin/phpunit -c phpunit.xml"
 	},
 	"require": {

lib/AppWhitelist.php

@@ -51,7 +51,7 @@ public function __construct(
 		$this->baseUrlLength = strlen($this->baseUrl);
 	}
 
-	public function isAppWhitelisted($appId): bool {
+	public function isAppWhitelisted(string $appId): bool {
 		$whitelist = $this->config->getAppWhitelist();
 		$alwaysEnabled = explode(',', self::WHITELIST_ALWAYS);
 
@@ -62,7 +62,10 @@ public function isWhitelistEnabled(): bool {
 		return $this->config->useWhitelist();
 	}
 
-	public function isUrlAllowed(IUser $user, $url): bool {
+	/**
+	 * @param false|string $url
+	 */
+	public function isUrlAllowed(IUser $user, string|false $url): bool {
 		if ($this->guestManager->isGuest($user) && $this->isWhitelistEnabled()) {
 			$app = $this->getRequestedApp($url);
 
@@ -95,8 +98,10 @@ public function verifyAccess(IUser $user, IRequest $request): void {
 	/**
 	 * Core has \OC::$REQUESTEDAPP but it isn't set until the routes are matched
 	 * taken from \OC\Route\Router::match()
+	 *
+	 * @param false|string $url
 	 */
-	private function getRequestedApp($url): string {
+	private function getRequestedApp(string|false $url): string {
 		if (substr($url, 0, $this->baseUrlLength) === $this->baseUrl) {
 			$url = substr($url, $this->baseUrlLength);
 		}

lib/GuestManager.php

@@ -149,7 +149,7 @@ private function getShareCountForUsers(array $guests): array {
 		return $data;
 	}
 
-	public function getGuestInfo($userId): array {
+	public function getGuestInfo(string $userId): array {
 		$shares = array_merge(
 			$this->shareManager->getSharedWith($userId, IShare::TYPE_USER, null, -1, 0),
 			$this->shareManager->getSharedWith($userId, IShare::TYPE_GROUP, null, -1, 0),

lib/Listener/BeforeUserManagementRenderedListener.php

@@ -18,6 +18,9 @@
  * @template-implements IEventListener<BeforeTemplateRenderedEvent>
  */
 class BeforeUserManagementRenderedListener implements IEventListener {
+	/**
+	 * @param Event $event
+	 */
 	public function handle(Event $event): void {
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {
 			return;

lib/Listener/LoadAdditionalScriptsListener.php

@@ -26,6 +26,9 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * @param Event $event
+	 */
 	public function handle(Event $event): void {
 		// If the user cannot create guests, we don't need to load the script
 		if (!$this->config->canCreateGuests()) {

psalm.xml

@@ -35,7 +35,36 @@
                 <referencedClass name="Doctrine\DBAL\Schema\SchemaException" />
                 <referencedClass name="Doctrine\DBAL\Driver\Statement" />
                 <referencedClass name="Doctrine\DBAL\Schema\Table" />
+                <referencedClass name="OC\AppFramework\OCS\BaseResponse"/>
+                <referencedClass name="OC\Security\CSP\ContentSecurityPolicyNonceManager" />
             </errorLevel>
         </UndefinedDocblockClass>
+        <UndefinedInterfaceMethod>
+            <errorLevel type="suppress">
+                <!-- FIXME Deprecated event handling -->
+                <referencedMethod name="OCP\IUserManager::listen" />
+                <referencedMethod name="OCP\IGroupManager::listen" />
+            </errorLevel>
+        </UndefinedInterfaceMethod>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <referencedClass name="OC_App" />
+                <referencedClass name="OC" />
+                <referencedClass name="OC\AppConfig"/>
+                <referencedClass name="OC\AppFramework\App" />
+                <referencedClass name="OC\Core\Command\Base" />
+                <referencedClass name="OC\Files\Cache\Wrapper\CachePermissionsMask" />
+                <referencedClass name="OC\Files\Filesystem" />
+                <referencedClass name="OC\Files\Storage\Wrapper\PermissionsMask" />
+                <referencedClass name="OC\Hooks\PublicEmitter" />
+                <referencedClass name="OC\L10N\Factory" />
+                <referencedClass name="OC\NavigationManager" />
+                <referencedClass name="OCA\Files\Event\LoadAdditionalScriptsEvent"/>
+                <referencedClass name="OCA\Files\Exception\TransferOwnershipException"/>
+                <referencedClass name="OCA\Files\Service\OwnershipTransferService" />
+                <referencedClass name="OCA\Settings\Events\BeforeTemplateRenderedEvent"/>
+                <referencedClass name="OCP\Template" />
+            </errorLevel>
+        </UndefinedClass>
     </issueHandlers>
 </psalm>