psalm: refactor suppressions

Signed-off-by: Varun Patil <radialapps@gmail.com>

lib/Command/Index.php

@@ -57,13 +57,8 @@ class IndexOpts
 
 class Index extends Command
 {
-    /** @psalm-suppress PropertyNotSetInConstructor */
     private InputInterface $input;
-
-    /** @psalm-suppress PropertyNotSetInConstructor */
     private OutputInterface $output;
-
-    /** @psalm-suppress PropertyNotSetInConstructor */
     private IndexOpts $opts;
 
     public function __construct(

lib/Command/MigrateGoogleTakeout.php

@@ -44,10 +44,7 @@ class MigrateGoogleTakeout extends Command
     protected const MIGRATOR_VERSION = 1;
     protected const MIGRATED_KEY = 'memoriesMigratorVersion';
 
-    /** @psalm-suppress PropertyNotSetInConstructor */
     protected OutputInterface $output;
-
-    /** @psalm-suppress PropertyNotSetInConstructor */
     protected InputInterface $input;
 
     // Stats

lib/Command/PlacesSetup.php

@@ -31,7 +31,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class PlacesSetup extends Command
 {
-    /** @psalm-suppress PropertyNotSetInConstructor */
     protected OutputInterface $output;
 
     public function __construct(protected Places $places)

lib/Db/AlbumsQuery.php

@@ -149,6 +149,7 @@ class AlbumsQuery
     public function getIfAllowed(string $uid, string $albumId): ?array
     {
         $album = null;
+        $albumUid = null;
 
         // Split name and uid
         $parts = explode('/', $albumId);
@@ -173,7 +174,6 @@ class AlbumsQuery
         }
 
         // Check if user is owner
-        /** @psalm-suppress PossiblyUndefinedVariable */
         if ($albumUid === $uid) {
             return $album;
         }

lib/Db/TimelineWriteOrphans.php

@@ -81,12 +81,13 @@ trait TimelineWriteOrphans
     protected function getSomeOrphans(int $count, array $fields): array
     {
         $query = $this->connection->getQueryBuilder();
-        $query->select(...$fields)
+
+        return $query->select(...$fields)
             ->from('memories')
             ->where($query->expr()->eq('orphan', $query->expr()->literal(1)))
             ->setMaxResults($count)
+            ->executeQuery()
+            ->fetchAll()
         ;
-
-        return $query->executeQuery()->fetchAll();
     }
 }

psalm-ls.xml

@@ -43,6 +43,11 @@
                 <file name="lib/Service/FileRobotMagick.php" />
             </errorLevel>
         </PossiblyUnusedMethod>
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <directory name="lib/Command" />
+            </errorLevel>
+        </PropertyNotSetInConstructor>
     </issueHandlers>
     <forbiddenFunctions>
         <function name="var_dump" />

psalm.xml

@@ -42,6 +42,11 @@
                 <file name="lib/Service/FileRobotMagick.php" />
             </errorLevel>
         </PossiblyUnusedMethod>
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <directory name="lib/Command" />
+            </errorLevel>
+        </PropertyNotSetInConstructor>
     </issueHandlers>
     <forbiddenFunctions>
             <function name="var_dump" />