Separate chain calls (#455)

config/routes.php

@@ -97,7 +97,9 @@
                 ->middleware(
                     fn (HttpCache $httpCache, PostRepository $postRepository) =>
                     $httpCache->withLastModified(function (ServerRequestInterface $request, $params) use ($postRepository) {
-                        return $postRepository->getMaxUpdatedAt()->getTimestamp();
+                        return $postRepository
+                            ->getMaxUpdatedAt()
+                            ->getTimestamp();
                     })
                 )
                 ->action([BlogController::class, 'index'])
@@ -120,7 +122,9 @@
                     fn (HttpCache $httpCache, PostRepository $postRepository, CurrentRoute $currentRoute) =>
                     $httpCache->withEtagSeed(function (ServerRequestInterface $request, $params) use ($postRepository, $currentRoute) {
                         $post = $postRepository->findBySlug($currentRoute->getArgument('slug'));
-                        return $post->getSlug() . '-' . $post->getUpdatedAt()->getTimestamp();
+                        return $post->getSlug() . '-' . $post
+                                ->getUpdatedAt()
+                                ->getTimestamp();
                     })
                 )
                 ->action([PostController::class, 'index'])

config/web/auth.php

@@ -21,7 +21,9 @@
 
 return [
     IdentityRepositoryInterface::class => static function (ContainerInterface $container): IdentityRepository {
-        return $container->get(ORMInterface::class)->getRepository(Identity::class);
+        return $container
+            ->get(ORMInterface::class)
+            ->getRepository(Identity::class);
     },
 
     CookieMiddleware::class => static fn (CookieLogin $cookieLogin, LoggerInterface $logger) => new CookieMiddleware(

config/web/comment-service.php

@@ -13,7 +13,9 @@
         /**
          * @var CommentRepository $repository
          */
-        $repository = $container->get(ORMInterface::class)->getRepository(Comment::class);
+        $repository = $container
+            ->get(ORMInterface::class)
+            ->getRepository(Comment::class);
 
         return new CommentService($repository);
     },

src/Auth/Controller/AuthController.php

@@ -45,7 +45,9 @@ public function login(
         if (
             $request->getMethod() === Method::POST
             && $loginForm->load(is_array($body) ? $body : [])
-            && $validator->validate($loginForm)->isValid()
+            && $validator
+                ->validate($loginForm)
+                ->isValid()
         ) {
             $identity = $this->authService->getIdentity();
 

src/Auth/Controller/SignupController.php

@@ -42,7 +42,9 @@ public function signup(
         if (
             $request->getMethod() === Method::POST
             && $signupForm->load(is_array($body) ? $body : [])
-            && $validator->validate($signupForm)->isValid()
+            && $validator
+                ->validate($signupForm)
+                ->isValid()
         ) {
             return $this->redirectToMain();
         }

src/Auth/Form/LoginForm.php

@@ -58,7 +58,9 @@ private function passwordRules(): array
                     $result = new Result();
 
                     if (!$this->authService->login($this->login, $this->password)) {
-                        $this->getFormErrors()->addError('login', '');
+                        $this
+                            ->getFormErrors()
+                            ->addError('login', '');
                         $result->addError($this->translator->translate('validator.invalid.login.password'));
                     }
 

src/Auth/Form/SignupForm.php

@@ -67,7 +67,9 @@ private function passwordVerifyRules(): array
             function (): Result {
                 $result = new Result();
                 if ($this->password !== $this->passwordVerify) {
-                    $this->getFormErrors()->addError('password', '');
+                    $this
+                        ->getFormErrors()
+                        ->addError('password', '');
                     $result->addError($this->translator->translate('validator.password.not.match'));
                 }
 

src/Blog/Archive/ArchiveController.php

@@ -41,7 +41,9 @@ public function monthlyArchive(CurrentRoute $currentRoute, TagRepository $tagRep
             'year' => $year,
             'month' => $month,
             'paginator' => $paginator,
-            'archive' => $archiveRepo->getFullArchive()->withLimit(12),
+            'archive' => $archiveRepo
+                ->getFullArchive()
+                ->withLimit(12),
             'tags' => $tagRepository->getTagMentions(self::POPULAR_TAGS_COUNT),
         ];
         return $this->viewRenderer->render('monthly-archive', $data);

src/Blog/Archive/ArchiveRepository.php

@@ -39,19 +39,28 @@ public function select(): Select
 
     public function getMonthlyArchive(int $year, int $month): DataReaderInterface
     {
-        $begin = (new \DateTimeImmutable())->setDate($year, $month, 1)->setTime(0, 0, 0);
-        $end = $begin->setDate($year, $month + 1, 1)->setTime(0, 0, -1);
+        $begin = (new \DateTimeImmutable())
+            ->setDate($year, $month, 1)
+            ->setTime(0, 0, 0);
+        $end = $begin
+            ->setDate($year, $month + 1, 1)
+            ->setTime(0, 0, -1);
 
-        $query = $this->select()
-                    ->andWhere('published_at', 'between', $begin, $end)
-                    ->load(['user', 'tags']);
+        $query = $this
+            ->select()
+            ->andWhere('published_at', 'between', $begin, $end)
+            ->load(['user', 'tags']);
         return $this->prepareDataReader($query);
     }
 
     public function getYearlyArchive(int $year): DataReaderInterface
     {
-        $begin = (new \DateTimeImmutable())->setDate($year, 1, 1)->setTime(0, 0, 0);
-        $end = $begin->setDate($year + 1, 1, 1)->setTime(0, 0, -1);
+        $begin = (new \DateTimeImmutable())
+            ->setDate($year, 1, 1)
+            ->setTime(0, 0, 0);
+        $end = $begin
+            ->setDate($year + 1, 1, 1)
+            ->setTime(0, 0, -1);
 
         $query = $this
             ->select()
@@ -89,7 +98,9 @@ public function getFullArchive(): DataReaderInterface
     private function extractFromDateColumn(string $attr): FragmentInterface
     {
         $driver = $this->getDriver();
-        $wrappedField = $driver->getQueryCompiler()->quoteIdentifier($attr);
+        $wrappedField = $driver
+            ->getQueryCompiler()
+            ->quoteIdentifier($attr);
         if ($driver instanceof SQLiteDriver) {
             $str = ['year' => '%Y', 'month' => '%m', 'day' => '%d'][$attr];
             return new Fragment("strftime('{$str}', post.published_at) {$wrappedField}");
@@ -99,12 +110,13 @@ private function extractFromDateColumn(string $attr): FragmentInterface
 
     private function getDriver(): DriverInterface
     {
-        return $this->select()
-                    ->getBuilder()
-                    ->getLoader()
-                    ->getSource()
-                    ->getDatabase()
-                    ->getDriver(DatabaseInterface::READ);
+        return $this
+            ->select()
+            ->getBuilder()
+            ->getLoader()
+            ->getSource()
+            ->getDatabase()
+            ->getDriver(DatabaseInterface::READ);
     }
 
     /**

src/Blog/BlogController.php

@@ -41,7 +41,9 @@ public function index(
 
         $data = [
             'paginator' => $paginator,
-            'archive' => $archiveRepo->getFullArchive()->withLimit(self::ARCHIVE_MONTHS_COUNT),
+            'archive' => $archiveRepo
+                ->getFullArchive()
+                ->withLimit(self::ARCHIVE_MONTHS_COUNT),
             'tags' => $tagRepository->getTagMentions(self::POPULAR_TAGS_COUNT),
             'isGuest' => $currentUser->isGuest(),
         ];

src/Blog/Post/PostController.php

@@ -56,7 +56,9 @@ public function add(Request $request, ValidatorInterface $validator): Response
 
         if ($request->getMethod() === Method::POST) {
             $form = new PostForm();
-            if ($form->load($parameters['body']) && $validator->validate($form)->isValid()) {
+            if ($form->load($parameters['body']) && $validator
+                    ->validate($form)
+                    ->isValid()) {
                 $this->postService->savePost($this->userService->getUser(), new Post(), $form);
                 return $this->webService->getRedirectResponse('blog/index');
             }
@@ -93,7 +95,9 @@ public function edit(
         if ($request->getMethod() === Method::POST) {
             $form = new PostForm();
             $body = $request->getParsedBody();
-            if ($form->load($body) && $validator->validate($form)->isValid()) {
+            if ($form->load($body) && $validator
+                    ->validate($form)
+                    ->isValid()) {
                 $this->postService->savePost($this->userService->getUser(), $post, $form);
                 return $this->webService->getRedirectResponse('blog/index');
             }

src/Blog/Post/PostRepository.php

@@ -31,7 +31,8 @@ public function __construct(Select $select, EntityWriter $entityWriter)
      */
     public function findAllPreloaded(): DataReaderInterface
     {
-        $query = $this->select()
+        $query = $this
+            ->select()
             ->load(['user', 'tags']);
         return $this->prepareDataReader($query);
     }
@@ -63,12 +64,17 @@ public function fullPostPage(string $slug): ?Post
 
     public function getMaxUpdatedAt(): DateTimeInterface
     {
-        return new DateTimeImmutable($this->select()->max('updated_at') ?? 'now');
+        return new DateTimeImmutable($this
+                ->select()
+                ->max('updated_at') ?? 'now');
     }
 
     public function findBySlug(string $slug): ?Post
     {
-        return $this->select()->where(['slug' => $slug])->fetchOne();
+        return $this
+            ->select()
+            ->where(['slug' => $slug])
+            ->fetchOne();
     }
 
     /**

src/Blog/Tag/TagRepository.php

@@ -33,9 +33,10 @@ public function getOrCreate(string $label): Tag
 
     public function findByLabel(string $label): ?Tag
     {
-        return $this->select()
-                    ->where(['label' => $label])
-                    ->fetchOne();
+        return $this
+            ->select()
+            ->where(['label' => $label])
+            ->fetchOne();
     }
 
     /**
@@ -70,8 +71,11 @@ public function getTagMentions(int $limit = 0): DataReaderInterface
             ->select()
             ->buildQuery()
             ->columns(['t.label', 'count(*) count'])
-            ->innerJoin('post', 'p')->on('p.id', 'postTag.post_id')->onWhere(['p.public' => true])
-            ->innerJoin('tag', 't')->on('t.id', 'postTag.tag_id')
+            ->innerJoin('post', 'p')
+            ->on('p.id', 'postTag.post_id')
+            ->onWhere(['p.public' => true])
+            ->innerJoin('tag', 't')
+            ->on('t.id', 'postTag.tag_id')
             ->groupBy('t.label, tag_id');
 
         /**
@@ -132,6 +136,8 @@ public function getTagMentions(int $limit = 0): DataReaderInterface
             ->columns(['label', 'count(*) count']);
 
         $sort = Sort::only(['count', 'label'])->withOrder(['count' => 'desc']);
-        return (new EntityReader($case3))->withSort($sort)->withLimit($limit);
+        return (new EntityReader($case3))
+            ->withSort($sort)
+            ->withLimit($limit);
     }
 }

src/Blog/Widget/PostCard.php

@@ -48,19 +48,25 @@ protected function renderHead(): string
             $this->urlGenerator->generate('blog/post', ['slug' => $this->post->getSlug()]),
             ['class' => 'mb-0 h4 text-decoration-none'] // stretched-link
         )
-        ->render();
+            ->render();
     }
 
     protected function renderBody(): string
     {
         $return = Html::openTag('div', ['class' => 'card-text mb-auto']);
         $return .= $this->post->getPublishedAt() === null
             ? 'not published'
-            : $this->post->getPublishedAt()->format('M, d');
+            : $this->post
+                ->getPublishedAt()
+                ->format('M, d');
         $return .= ' by ';
         $return .= Html::a(
-            $this->post->getUser()->getLogin(),
-            $this->urlGenerator->generate('user/profile', ['login' => $this->post->getUser()->getLogin()])
+            $this->post
+                ->getUser()
+                ->getLogin(),
+            $this->urlGenerator->generate('user/profile', ['login' => $this->post
+                ->getUser()
+                ->getLogin()])
         )->class('mb-1 text-muted');
 
         $return .= Html::p(

src/Command/Fixture/AddCommand.php

@@ -97,7 +97,9 @@ private function addUsers(int $count): void
     private function addTags(int $count): void
     {
         /** @var TagRepository $tagRepository */
-        $tagRepository = $this->promise->getORM()->getRepository(Tag::class);
+        $tagRepository = $this->promise
+            ->getORM()
+            ->getRepository(Tag::class);
         $this->tags = [];
         $tagWords = [];
         for ($i = 0, $fails = 0; $i < $count; ++$i) {

src/Contact/ContactController.php

@@ -41,7 +41,9 @@ public function contact(
     ): ResponseInterface {
         $body = $request->getParsedBody();
         $form = new ContactForm();
-        if (($request->getMethod() === Method::POST) && $form->load((array)$body) && $validator->validate($form)->isValid()) {
+        if (($request->getMethod() === Method::POST) && $form->load((array)$body) && $validator
+                ->validate($form)
+                ->isValid()) {
             $this->mailer->send($form, $request);
 
             return $this->responseFactory

src/Contact/ContactMailer.php

@@ -40,12 +40,13 @@ public function __construct(
 
     public function send(FormModelInterface $form, ServerRequestInterface $request)
     {
-        $message = $this->mailer->compose(
-            'contact-email',
-            [
-                'content' => $form->getAttributeValue('body'),
-            ]
-        )
+        $message = $this->mailer
+            ->compose(
+                'contact-email',
+                [
+                    'content' => $form->getAttributeValue('body'),
+                ]
+            )
             ->withSubject($form->getAttributeValue('subject'))
             ->withFrom([$form->getAttributeValue('email') => $form->getAttributeValue('name')])
             ->withSender($this->sender)

src/Handler/NotFoundHandler.php

@@ -21,6 +21,8 @@ public function __construct(ViewRenderer $viewRenderer)
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        return $this->viewRenderer->render('404')->withStatus(Status::NOT_FOUND);
+        return $this->viewRenderer
+            ->render('404')
+            ->withStatus(Status::NOT_FOUND);
     }
 }

src/Middleware/LocaleMiddleware.php

@@ -74,7 +74,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
             $response = $handler->handle($request);
             if ($this->isDefaultLocale($locale, $country) && $request->getMethod() === 'GET') {
-                $response = $this->responseFactory->createResponse(Status::FOUND)
+                $response = $this->responseFactory
+                    ->createResponse(Status::FOUND)
                     ->withHeader(Header::LOCATION, $newPath);
             }
             if ($this->enableSaveLocale) {
@@ -96,7 +97,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $this->urlGenerator->setDefaultArgument($this->queryParameterName, $locale);
 
         if ($request->getMethod() === 'GET') {
-            return $this->responseFactory->createResponse(Status::FOUND)
+            return $this->responseFactory
+                ->createResponse(Status::FOUND)
                 ->withHeader(Header::LOCATION, '/' . $locale . $path);
         }
 

src/User/Controller/ApiUserController.php

@@ -36,12 +36,16 @@ public function __construct(DataResponseFactoryInterface $responseFactory)
      */
     public function index(UserRepository $userRepository): ResponseInterface
     {
-        $dataReader = $userRepository->findAll()->withSort(Sort::only(['login'])->withOrderString('login'));
+        $dataReader = $userRepository
+            ->findAll()
+            ->withSort(Sort::only(['login'])->withOrderString('login'));
         $users = $dataReader->read();
 
         $items = [];
         foreach ($users as $user) {
-            $items[] = ['login' => $user->getLogin(), 'created_at' => $user->getCreatedAt()->format('H:i:s d.m.Y')];
+            $items[] = ['login' => $user->getLogin(), 'created_at' => $user
+                ->getCreatedAt()
+                ->format('H:i:s d.m.Y')];
         }
 
         return $this->responseFactory->createResponse($items);
@@ -71,7 +75,9 @@ public function profile(UserRepository $userRepository, CurrentRoute $currentRou
         }
 
         return $this->responseFactory->createResponse(
-            ['login' => $user->getLogin(), 'created_at' => $user->getCreatedAt()->format('H:i:s d.m.Y')]
+            ['login' => $user->getLogin(), 'created_at' => $user
+                ->getCreatedAt()
+                ->format('H:i:s d.m.Y')]
         );
     }
 }