Fix code style

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
nextcloud · Nov 18, 2021 · f0a1c92 · f0a1c92
1 parent fbacf4c
commit f0a1c92
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 38 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -6,8 +6,8 @@
 * [Robin Appelman](mailto:icewind@owncloud.com)
 * [Sean Molenaar](mailto:sean@seanmolenaar.eu)
 * [Gregor Tätzner](mailto:gregor@freenet.de)
-* [anoy](mailto:anoymouserver+github@mailbox.org)
 * [Sean Molenaar](mailto:SMillerDev@users.noreply.github.com)
+* [anoy](mailto:anoymouserver+github@mailbox.org)
 * [Morris Jobke](mailto:hey@morrisjobke.de)
 * [Jimmy Huynh](mailto:jimmy.huynh@etu.unistra.fr)
 * [Aurélien](mailto:dav.aurelien@gmail.com)

diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php
@@ -53,18 +53,18 @@ public function findAllFromUser(string $userId, array $params = []): array
     {
         $builder = $this->db->getQueryBuilder();
         $builder->select('feeds.*', $builder->func()->count('items.id', 'unreadCount'))
-                ->from(static::TABLE_NAME, 'feeds')
-                ->leftJoin(
-                    'feeds',
-                    ItemMapperV2::TABLE_NAME,
-                    'items',
-                    'items.feed_id = feeds.id AND items.unread = :unread'
-                )
-                ->where('feeds.user_id = :user_id')
-                ->andWhere('feeds.deleted_at = 0')
-                ->groupBy('feeds.id')
-                ->setParameter('unread', true, IQueryBuilder::PARAM_BOOL)
-                ->setParameter('user_id', $userId);
+            ->from(static::TABLE_NAME, 'feeds')
+            ->leftJoin(
+                'feeds',
+                ItemMapperV2::TABLE_NAME,
+                'items',
+                'items.feed_id = feeds.id AND items.unread = :unread'
+            )
+            ->where('feeds.user_id = :user_id')
+            ->andWhere('feeds.deleted_at = 0')
+            ->groupBy('feeds.id')
+            ->setParameter('unread', true, IQueryBuilder::PARAM_BOOL)
+            ->setParameter('user_id', $userId);
 
         return $this->findEntities($builder);
     }
@@ -84,11 +84,11 @@ public function findFromUser(string $userId, int $id): Entity
     {
         $builder = $this->db->getQueryBuilder();
         $builder->select('*')
-                ->from(static::TABLE_NAME)
-                ->where('user_id = :user_id')
-                ->andWhere('id = :id')
-                ->setParameter('user_id', $userId)
-                ->setParameter('id', $id);
+            ->from(static::TABLE_NAME)
+            ->where('user_id = :user_id')
+            ->andWhere('id = :id')
+            ->setParameter('user_id', $userId)
+            ->setParameter('id', $id);
 
         return $this->findEntity($builder);
     }
@@ -102,8 +102,8 @@ public function findAll(): array
     {
         $builder = $this->db->getQueryBuilder();
         $builder->select('*')
-                ->from(static::TABLE_NAME)
-                ->where('deleted_at = 0');
+            ->from(static::TABLE_NAME)
+            ->where('deleted_at = 0');
 
         return $this->findEntities($builder);
     }
@@ -123,11 +123,11 @@ public function findByURL(string $userId, string $url): Entity
     {
         $builder = $this->db->getQueryBuilder();
         $builder->select('*')
-                ->from(static::TABLE_NAME)
-                ->where('user_id = :user_id')
-                ->andWhere('url = :url')
-                ->setParameter('user_id', $userId)
-                ->setParameter('url', $url);
+            ->from(static::TABLE_NAME)
+            ->where('user_id = :user_id')
+            ->andWhere('url = :url')
+            ->setParameter('user_id', $userId)
+            ->setParameter('url', $url);
 
         return $this->findEntity($builder);
     }
@@ -143,13 +143,13 @@ public function findAllFromFolder(?int $id): array
     {
         $builder = $this->db->getQueryBuilder();
         $builder->select('*')
-                ->from(static::TABLE_NAME);
+            ->from(static::TABLE_NAME);
 
         if (is_null($id)) {
             $builder->where('folder_id IS NULL');
         } else {
             $builder->where('folder_id = :folder_id')
-                    ->setParameter('folder_id', $id);
+                ->setParameter('folder_id', $id);
         }
 
         return $this->findEntities($builder);
@@ -163,7 +163,6 @@ public function findAllFromFolder(?int $id): array
      * @return int
      * @throws DBException
      *
-     * @TODO Update for NC 21
      */
     public function read(string $userId, int $id, ?int $maxItemID = null): int
     {
@@ -178,12 +177,15 @@ public function read(string $userId, int $id, ?int $maxItemID = null): int
 
         if ($maxItemID !== null) {
             $idBuilder->andWhere('items.id <= :maxItemId')
-                      ->setParameter('maxItemId', $maxItemID);
+                ->setParameter('maxItemId', $maxItemID);
         }
 
-        $idList = array_map(function ($value): int {
-            return intval($value['id']);
-        }, $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll());
+        $idList = array_map(
+            function ($value): int {
+                return intval($value['id']);
+            },
+            $this->db->executeQuery($idBuilder->getSQL(), $idBuilder->getParameters())->fetchAll()
+        );
 
         $builder = $this->db->getQueryBuilder();
         $builder->update(ItemMapperV2::TABLE_NAME)
@@ -193,6 +195,10 @@ public function read(string $userId, int $id, ?int $maxItemID = null): int
             ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL)
             ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY);
 
-        return $this->db->executeStatement($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes());
+        return $this->db->executeStatement(
+            $builder->getSQL(),
+            $builder->getParameters(),
+            $builder->getParameterTypes()
+        );
     }
 }
diff --git a/lib/Db/FolderMapperV2.php b/lib/Db/FolderMapperV2.php
@@ -106,7 +106,7 @@ public function findFromUser(string $userId, int $id): Entity
      * @return int
      *
      * @throws DBException
-     * @TODO Update for NC 21
+     *
      */
     public function read(string $userId, int $id, ?int $maxItemID = null): int
     {
@@ -136,6 +136,10 @@ public function read(string $userId, int $id, ?int $maxItemID = null): int
             ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL)
             ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY);
 
-        return $this->db->executeStatement($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes());
+        return $this->db->executeStatement(
+            $builder->getSQL(),
+            $builder->getParameters(),
+            $builder->getParameterTypes()
+        );
     }
 }
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php
@@ -253,8 +253,6 @@ public function purgeDeleted(?string $userID, ?int $oldestDelete): void
      * @param string $userId
      * @param int    $maxItemId
      *
-     * @TODO: Update this for NC 21
-     *
      * @return int
      *
      * @throws DBException
@@ -282,7 +280,11 @@ public function readAll(string $userId, int $maxItemId): int
             ->setParameter('unread', false, IQueryBuilder::PARAM_BOOL)
             ->setParameter('idList', $idList, IQueryBuilder::PARAM_INT_ARRAY);
 
-        return $this->db->executeStatement($builder->getSQL(), $builder->getParameters(), $builder->getParameterTypes());
+        return $this->db->executeStatement(
+            $builder->getSQL(),
+            $builder->getParameters(),
+            $builder->getParameterTypes()
+        );
     }
 
     /**