$ ./vendor/bin/pint @ be

n0099 · Oct 9, 2024 · 1725db5 · 1725db5
1 parent 1119482
commit 1725db5
Show file tree

Hide file tree

Showing 35 changed files with 103 additions and 64 deletions.
diff --git a/be/config/preload.php b/be/config/preload.php
@@ -1,5 +1,5 @@
 <?php
 
-if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
-    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+if (file_exists(dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php';
 }
diff --git a/be/public/index.php b/be/public/index.php
@@ -2,7 +2,7 @@
 
 use App\Kernel;
 
-require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
+require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
 
 return function (array $context) {
     return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

diff --git a/be/src/Controller/AssetController.php b/be/src/Controller/AssetController.php
@@ -16,9 +16,9 @@ public function __construct(
     ) {}
 
     #[Route('/assets/{filename}', requirements: [
-        'filename' => /** @lang JSRegexp */'(react(|-dom|-json-view)|scheduler)\.js'
+        'filename' => /** @lang JSRegexp */'(react(|-dom|-json-view)|scheduler)\.js',
     ])]
-    public function getAsset(string $filename) : Response
+    public function getAsset(string $filename): Response
     {
         return new Response(
             content: preg_replace_callback_array([
@@ -27,9 +27,9 @@ public function getAsset(string $filename) : Response
                 '@^//# sourceMappingURL=.+$@m' =>
                     static fn() => '',
             ], $this->filesystem->readFile(
-                $this->getParameter('kernel.project_dir') . "/public/react-json-view/$filename"
+                $this->getParameter('kernel.project_dir') . "/public/react-json-view/$filename",
             )),
-            headers: ['Content-Type' => 'text/javascript']
+            headers: ['Content-Type' => 'text/javascript'],
         );
     }
 }
diff --git a/be/src/Controller/ForumsController.php b/be/src/Controller/ForumsController.php
@@ -8,7 +8,7 @@
 
 class ForumsController extends AbstractController
 {
-    public function __construct(private readonly ForumRepository $repository,) {}
+    public function __construct(private readonly ForumRepository $repository) {}
 
     #[Route('/api/forums')]
     public function query(): array

diff --git a/be/src/Controller/PostsController.php b/be/src/Controller/PostsController.php
@@ -52,7 +52,7 @@ public function query(Request $request): array
         $this->validator->validate($request->query->all(), new Assert\Collection([
             'cursor' => new Assert\Optional(new Assert\Regex( // https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
                 // (,|$)|,){5,6} means allow at most 5~6 parts of base64 segment or empty string to exist
-                '/^(([A-Za-z0-9-_]{4})*([A-Za-z0-9-_]{2,3})(,|$)|,){5,6}$/'
+                '/^(([A-Za-z0-9-_]{4})*([A-Za-z0-9-_]{2,3})(,|$)|,){5,6}$/',
             )),
             'query' => new Assert\Required(new Assert\Json()),
         ]));
@@ -112,12 +112,12 @@ public function query(Request $request): array
         $fid = $result['fid'];
         $authorExpGrades = collect($this->authorExpGradeRepository->getLatestOfUsers($fid, $uids))
             ->keyBy(fn(AuthorExpGrade $authorExpGrade) => $authorExpGrade->getUid());
-        $users->each(fn (User $user) => $user->setCurrentAuthorExpGrade($authorExpGrades[$user->getUid()]));
+        $users->each(fn(User $user) => $user->setCurrentAuthorExpGrade($authorExpGrades[$user->getUid()]));
 
         $forumModerators = collect($this->forumModeratorRepository
                 ->getLatestOfUsers($fid, $users->map(fn(User $user) => $user->getPortrait())))
             ->keyBy(fn(ForumModerator $forumModerator) => $forumModerator->getPortrait());
-        $users->each(fn (User $user) => $user->setCurrentForumModerator($forumModerators->get($user->getPortrait())));
+        $users->each(fn(User $user) => $user->setCurrentForumModerator($forumModerators->get($user->getPortrait())));
         $this->stopwatch->stop('queryUserRelated');
 
         return [

diff --git a/be/src/Controller/SitemapController.php b/be/src/Controller/SitemapController.php
@@ -21,7 +21,7 @@ class SitemapController extends AbstractController
     public function __construct(
         private readonly CacheInterface $cache,
         private readonly ForumRepository $forumRepository,
-        private readonly PostRepositoryFactory $postRepositoryFactory
+        private readonly PostRepositoryFactory $postRepositoryFactory,
     ) {}
 
     #[Route('/sitemaps/forums')]
@@ -41,7 +41,8 @@ function (ItemInterface $item) use ($threadsIdKeyByFid) {
                     'sitemaps/forums.xml.twig',
                     ['threads_id_key_by_fid' => $threadsIdKeyByFid],
                 );
-            });
+            },
+        );
     }
 
     #[Route('/sitemaps/forums/{fid}/threads', requirements: ['fid' => /** @lang JSRegexp */'\d+'])]
@@ -60,10 +61,11 @@ function (ItemInterface $item) use ($fid, $cursor) {
                     [
                         'threads_id' =>
                             $this->postRepositoryFactory->newThread($fid)->getThreadsIdAfter($cursor, self::$maxUrls),
-                        'base_url_fe' => $this->getParameter('app.base_url.fe')
-                    ]
+                        'base_url_fe' => $this->getParameter('app.base_url.fe'),
+                    ],
                 );
-            });
+            },
+        );
     }
 
     private function renderXml(string $view, array $parameters): Response

diff --git a/be/src/Controller/UsersController.php b/be/src/Controller/UsersController.php
@@ -47,7 +47,7 @@ function (array $acc, $paramValue, string $paramName) use ($paramConstraints): a
                         : $queryBuilder->andWhere("t.$paramName = ?$paramIndex")
                             ->setParameter($paramIndex, $paramValue)];
                 },
-                [0, $this->userRepository->createQueryBuilder('t')]
+                [0, $this->userRepository->createQueryBuilder('t')],
             )[1]->orderBy('t.uid', 'DESC');
 
         ['result' => $result, 'hasMorePages' => $hasMorePages] =

diff --git a/be/src/DTO/User/AuthorExpGrade.php b/be/src/DTO/User/AuthorExpGrade.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\DTO\User;
 
@@ -9,10 +11,13 @@
 readonly class AuthorExpGrade
 {
     public function __construct(
-        #[ORM\Column, ORM\Id] private int $uid,
-        #[ORM\Column] private int $discoveredAt,
-        #[ORM\Column] private int $authorExpGrade)
-    {}
+        #[ORM\Column, ORM\Id]
+        private int $uid,
+        #[ORM\Column]
+        private int $discoveredAt,
+        #[ORM\Column]
+        private int $authorExpGrade,
+    ) {}
 
     #[Ignore]
     public function getUid(): int

diff --git a/be/src/DTO/User/ForumModerator.php b/be/src/DTO/User/ForumModerator.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\DTO\User;
 
@@ -9,10 +11,13 @@
 readonly class ForumModerator
 {
     public function __construct(
-        #[ORM\Column, ORM\Id] private string $portrait,
-        #[ORM\Column] private int $discoveredAt,
-        #[ORM\Column] private string $moderatorTypes)
-    {}
+        #[ORM\Column, ORM\Id]
+        private string $portrait,
+        #[ORM\Column]
+        private int $discoveredAt,
+        #[ORM\Column]
+        private string $moderatorTypes,
+    ) {}
 
     #[Ignore]
     public function getPortrait(): string

diff --git a/be/src/Entity/Forum.php b/be/src/Entity/Forum.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity;
 

diff --git a/be/src/Entity/LatestReplier.php b/be/src/Entity/LatestReplier.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity;
 

diff --git a/be/src/Entity/Post/Content/PostContent.php b/be/src/Entity/Post/Content/PostContent.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post\Content;
 

diff --git a/be/src/Entity/Post/Content/ReplyContent.php b/be/src/Entity/Post/Content/ReplyContent.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post\Content;
 

diff --git a/be/src/Entity/Post/Content/SubReplyContent.php b/be/src/Entity/Post/Content/SubReplyContent.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post\Content;
 

diff --git a/be/src/Entity/Post/Post.php b/be/src/Entity/Post/Post.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post;
 

diff --git a/be/src/Entity/Post/Reply.php b/be/src/Entity/Post/Reply.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post;
 

diff --git a/be/src/Entity/Post/SubReply.php b/be/src/Entity/Post/SubReply.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post;
 
@@ -34,7 +36,5 @@ public function getIsMatchQuery(): bool
         return true;
     }
 
-    public function setIsMatchQuery(bool $isMatchQuery): void
-    {
-    }
+    public function setIsMatchQuery(bool $isMatchQuery): void {}
 }
diff --git a/be/src/Entity/Post/Thread.php b/be/src/Entity/Post/Thread.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Post;
 

diff --git a/be/src/Entity/Revision/AuthorExpGrade.php b/be/src/Entity/Revision/AuthorExpGrade.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Revision;
 

diff --git a/be/src/Entity/Revision/ForumModerator.php b/be/src/Entity/Revision/ForumModerator.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity\Revision;
 

diff --git a/be/src/Entity/TimestampedEntity.php b/be/src/Entity/TimestampedEntity.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity;
 

diff --git a/be/src/Entity/User.php b/be/src/Entity/User.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+<?php
+
+/** @noinspection PhpPropertyOnlyWrittenInspection */
 
 namespace App\Entity;
 

diff --git a/be/src/EventListener/ExceptionToJsonResponse.php b/be/src/EventListener/ExceptionToJsonResponse.php
@@ -28,8 +28,8 @@ public function __invoke(ExceptionEvent $event): void
                 // https://github.com/symfony/serializer/blob/7.1/Normalizer/ConstraintViolationListNormalizer.php
                 $this->serializer->serialize([
                     'errorCode' => 40000,
-                    'errorInfo' => $exception->getViolations()
-                ], 'json')
+                    'errorInfo' => $exception->getViolations(),
+                ], 'json'),
             ));
         }
     }

diff --git a/be/src/EventListener/SerializeToJson.php b/be/src/EventListener/SerializeToJson.php
@@ -15,7 +15,7 @@ public function __construct(private SerializerInterface $serializer) {}
     public function __invoke(ViewEvent $event): void
     {
         $event->setResponse(JsonResponse::fromJsonString(
-            $this->serializer->serialize($event->getControllerResult(), 'json')
+            $this->serializer->serialize($event->getControllerResult(), 'json'),
         ));
     }
 }
diff --git a/be/src/Kernel.php b/be/src/Kernel.php
@@ -17,7 +17,7 @@ public function boot(): void
         /** @see CollectionMacroServiceProvider::register() */
         collect([
             'recursive' => Recursive::class,
-        ])->reject(fn ($class, $macro) => Collection::hasMacro($macro))
-            ->each(fn ($class, $macro) => Collection::macro($macro, (new $class())()));
+        ])->reject(fn($class, $macro) => Collection::hasMacro($macro))
+            ->each(fn($class, $macro) => Collection::macro($macro, (new $class())()));
     }
 }
diff --git a/be/src/PostsQuery/BaseQuery.php b/be/src/PostsQuery/BaseQuery.php
@@ -93,7 +93,8 @@ protected function setResult(
             $comparisons = $cursors->keys()->map(
                 fn(string $fieldName): Expr\Comparison => $this->orderByDesc
                     ? $qb->expr()->lt("t.$fieldName", ":cursor_$fieldName")
-                    : $qb->expr()->gt("t.$fieldName", ":cursor_$fieldName"));
+                    : $qb->expr()->gt("t.$fieldName", ":cursor_$fieldName"),
+            );
             $qb->andWhere($qb->expr()->orX(...$comparisons));
             $cursors->mapWithKeys(fn($fieldValue, string $fieldName) =>
                 $qb->setParameter("cursor_$fieldName", $fieldValue)); // prevent overwriting existing param

diff --git a/be/src/PostsQuery/IndexQuery.php b/be/src/PostsQuery/IndexQuery.php
@@ -18,7 +18,7 @@ public function __construct(
         Stopwatch $stopwatch,
         CursorCodec $cursorCodec,
         private readonly PostRepositoryFactory $postRepositoryFactory,
-        private readonly ForumRepository $forumRepository
+        private readonly ForumRepository $forumRepository,
     ) {
         parent::__construct($normalizer, $stopwatch, $cursorCodec, $postRepositoryFactory);
     }

diff --git a/be/src/PostsQuery/SearchQuery.php b/be/src/PostsQuery/SearchQuery.php
@@ -17,7 +17,7 @@ public function __construct(
         Stopwatch $stopwatch,
         CursorCodec $cursorCodec,
         private readonly PostRepositoryFactory $postRepositoryFactory,
-        private readonly UserRepository $userRepository
+        private readonly UserRepository $userRepository,
     ) {
         parent::__construct($normalizer, $stopwatch, $cursorCodec, $postRepositoryFactory);
     }
@@ -118,7 +118,7 @@ static function (QueryBuilder $newQueryWhenCacheMiss) use (&$outCachedUserQueryR
                     default => $query->andWhere(
                         "t.$fieldNameOfNumericParams "
                             . ($sub['not'] ? $inverseRangeOfNumericParams : $sub['range'])
-                            . " :$sqlParamName"
+                            . " :$sqlParamName",
                     )->setParameter($sqlParamName, $value),
                 },
             // textMatch
@@ -146,7 +146,7 @@ static function (QueryBuilder $newQueryWhenCacheMiss) use (&$outCachedUserQueryR
                             $value,
                             $sub,
                             $sqlParamName,
-                        ))
+                        )),
                     ),
             'authorGender', 'latestReplierGender' =>
                 $query->andWhere("t.{$userTypeOfUserParams}Uid $not IN (:$sqlParamName)")
@@ -155,7 +155,7 @@ static function (QueryBuilder $newQueryWhenCacheMiss) use (&$outCachedUserQueryR
                         $getAndCacheUserQuery($this->userRepository->createQueryBuilder('t')
                             ->select('t.uid')
                             ->andWhere("t.gender = :{$sqlParamName}_gender")
-                            ->setParameter("{$sqlParamName}_gender", $value))
+                            ->setParameter("{$sqlParamName}_gender", $value)),
                     ),
             'authorManagerType' =>
                 $value === 'NULL'
@@ -188,7 +188,7 @@ private static function applyTextMatchParamOnQuery(
             }
             $query = $query->setParameter(
                 "{$sqlParamName}_$keywordIndex",
-                $subParams['matchBy'] === 'implicit' ? "%$keyword%" : $keyword
+                $subParams['matchBy'] === 'implicit' ? "%$keyword%" : $keyword,
             );
         }
         return $query;

diff --git a/be/src/Repository/Post/PostRepository.php b/be/src/Repository/Post/PostRepository.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpMultipleClassDeclarationsInspection */
+<?php
+
+/** @noinspection PhpMultipleClassDeclarationsInspection */
 
 namespace App\Repository\Post;
 
@@ -28,7 +30,7 @@ public function __construct(
     ) {
         parent::__construct($registry, $postRepositoryClass);
         $entityManager->getClassMetadata($postRepositoryClass)->setPrimaryTable([
-            'name' => "\"tbmc_f{$fid}_" . $this->getTableNameSuffix() . '"'
+            'name' => "\"tbmc_f{$fid}_" . $this->getTableNameSuffix() . '"',
         ]);
     }