Merge pull request #23 from duboiss/feature/php

duboiss · Dec 10, 2023 · 06b8f63 · 06b8f63
2 parents 96a9be7 + ec5b35b
commit 06b8f63
Show file tree

Hide file tree

Showing 32 changed files with 634 additions and 665 deletions.
diff --git a/.symfony.insight.yaml b/.symfony.insight.yaml
@@ -1,4 +1,4 @@
-php_version: 8.1
+php_version: 8.2
 
 rules:
     composer.invalid_file:

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "type": "project",
     "license": "proprietary",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "doctrine/doctrine-bundle": "^2.1",
@@ -59,7 +59,7 @@
     },
     "config": {
         "platform": {
-            "php": "8.1"
+            "php": "8.2"
         },
         "preferred-install": {
             "*": "dist"

diff --git a/composer.lock b/composer.lock
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.2
 
 FROM php:${PHP_VERSION}-fpm AS symforum_php
 

diff --git a/rector.php b/rector.php
@@ -16,5 +16,5 @@
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
 
     // define sets of rules
-    $rectorConfig->sets([LevelSetList::UP_TO_PHP_81]);
+    $rectorConfig->sets([LevelSetList::UP_TO_PHP_82]);
 };
diff --git a/src/Controller/Admin/CategoryAdminController.php b/src/Controller/Admin/CategoryAdminController.php
@@ -21,7 +21,7 @@
 #[Route(path: '/admin/categories', name: 'admin.category.')]
 class CategoryAdminController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }

diff --git a/src/Controller/Admin/ReportAdminController.php b/src/Controller/Admin/ReportAdminController.php
@@ -19,7 +19,7 @@
 #[Route(path: '/admin/reports', name: 'admin.report.')]
 class ReportAdminController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }

diff --git a/src/Controller/Admin/UserAdminController.php b/src/Controller/Admin/UserAdminController.php
@@ -20,7 +20,7 @@
 #[Route(path: '/admin/users', name: 'admin.user.')]
 class UserAdminController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }

diff --git a/src/Controller/ForumController.php b/src/Controller/ForumController.php
@@ -25,7 +25,7 @@
 #[Route(path: '/forums')]
 class ForumController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }

diff --git a/src/Controller/MessageController.php b/src/Controller/MessageController.php
@@ -23,7 +23,7 @@
 #[Route(path: '/forums/messages', name: 'message.')]
 class MessageController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }

diff --git a/src/Controller/ReportController.php b/src/Controller/ReportController.php
@@ -19,7 +19,7 @@
 #[Route(path: '/forums/reports', name: 'report.')]
 class ReportController extends AbstractBaseController
 {
-    public function __construct(private readonly RequestStack $requestStack, private DecoderInterface $decoder, private readonly TranslatorInterface $translator)
+    public function __construct(private readonly RequestStack $requestStack, private readonly DecoderInterface $decoder, private readonly TranslatorInterface $translator)
     {
         parent::__construct($requestStack, $this->decoder);
     }
@@ -28,7 +28,7 @@ public function __construct(private readonly RequestStack $requestStack, private
     #[Route(path: '/{uuid}', name: 'message', methods: ['POST'])]
     public function message(Message $message, Request $request, ReportService $reportService, ReportRepository $reportRepository): Response
     {
-        $reason = trim($this->jsonDecodeRequestContent($request)['reason']);
+        $reason = trim((string) $this->jsonDecodeRequestContent($request)['reason']);
 
         if ($reportRepository->findOneBy(['message' => $message, 'reportedBy' => $this->getUser()])) {
             return $this->json([

diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
@@ -26,7 +26,5 @@ public function login(AuthenticationUtils $authenticationUtils, Request $request
     }
 
     #[Route(path: '/logout', name: 'security.logout', methods: ['GET'])]
-    public function logout(): void
-    {
-    }
+    public function logout(): void {}
 }
diff --git a/src/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php
@@ -11,9 +11,7 @@
 
 class UserFixtures extends BaseFixtures
 {
-    public function __construct(private readonly UserPasswordHasherInterface $hasher)
-    {
-    }
+    public function __construct(private readonly UserPasswordHasherInterface $hasher) {}
 
     protected function loadData(ObjectManager $manager): void
     {

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -170,9 +170,7 @@ public function getPassword(): ?string
         return $this->hash;
     }
 
-    public function eraseCredentials(): void
-    {
-    }
+    public function eraseCredentials(): void {}
 
     public function getUserIdentifier(): string
     {

diff --git a/src/EventListener/LogoutListener.php b/src/EventListener/LogoutListener.php
@@ -15,7 +15,7 @@ class LogoutListener
 {
     private readonly FlashBagInterface $flashBag;
 
-    public function __construct(RequestStack $requestStack, private TranslatorInterface $translator)
+    public function __construct(RequestStack $requestStack, private readonly TranslatorInterface $translator)
     {
         $this->flashBag = $requestStack->getSession()->getFlashBag();
     }

diff --git a/src/EventSubscriber/UserActivitySubscriber.php b/src/EventSubscriber/UserActivitySubscriber.php
@@ -15,9 +15,7 @@
 
 class UserActivitySubscriber implements EventSubscriberInterface
 {
-    public function __construct(private readonly EntityManagerInterface $em, private readonly Security $security, private readonly OptionService $optionService, private readonly UserRepository $userRepository)
-    {
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly Security $security, private readonly OptionService $optionService, private readonly UserRepository $userRepository) {}
 
     public function onTerminate(): void
     {

diff --git a/src/Form/ThreadType.php b/src/Form/ThreadType.php
@@ -16,9 +16,7 @@
 
 class ThreadType extends AbstractType
 {
-    public function __construct(private TranslatorInterface $translator)
-    {
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {

diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingsType.php
@@ -14,9 +14,7 @@
 
 class UserSettingsType extends AbstractType
 {
-    public function __construct(private readonly TranslatorInterface $translator)
-    {
-    }
+    public function __construct(private readonly TranslatorInterface $translator) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {

diff --git a/src/Security/LoginFormAuthenticator.php b/src/Security/LoginFormAuthenticator.php
@@ -25,9 +25,7 @@ class LoginFormAuthenticator extends AbstractLoginFormAuthenticator
     final public const REDIRECT_AFTER_LOGIN_ROUTE = 'forum.index';
     private const FORUMS_PARENT_PATH = '/forums';
 
-    public function __construct(private readonly RouterInterface $router, private readonly CsrfTokenManagerInterface $csrfTokenManager)
-    {
-    }
+    public function __construct(private readonly RouterInterface $router, private readonly CsrfTokenManagerInterface $csrfTokenManager) {}
 
     protected function getLoginUrl(Request $request): string
     {

diff --git a/src/Security/Voter/ForumVoter.php b/src/Security/Voter/ForumVoter.php
@@ -15,9 +15,7 @@ class ForumVoter extends Voter
 {
     private const LOCK = 'LOCK';
 
-    public function __construct(private readonly Security $security)
-    {
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports(string $attribute, mixed $subject): bool
     {

diff --git a/src/Security/Voter/MessageVoter.php b/src/Security/Voter/MessageVoter.php
@@ -18,9 +18,7 @@ class MessageVoter extends Voter
     private const LIKE = 'LIKE';
     private const REPORT = 'REPORT';
 
-    public function __construct(private readonly Security $security)
-    {
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports(string $attribute, mixed $subject): bool
     {

diff --git a/src/Security/Voter/ThreadVoter.php b/src/Security/Voter/ThreadVoter.php
@@ -17,9 +17,7 @@ class ThreadVoter extends Voter
     private const PIN = 'PIN';
     private const DELETE = 'DELETE';
 
-    public function __construct(private readonly Security $security)
-    {
-    }
+    public function __construct(private readonly Security $security) {}
 
     protected function supports(string $attribute, mixed $subject): bool
     {

diff --git a/src/Service/AntispamService.php b/src/Service/AntispamService.php
@@ -17,9 +17,7 @@ class AntispamService
 
     private const DELAY_THREAD = 90;
 
-    public function __construct(private readonly ThreadRepository $threadRepository, private readonly MessageRepository $messageRepository, private readonly Security $security)
-    {
-    }
+    public function __construct(private readonly ThreadRepository $threadRepository, private readonly MessageRepository $messageRepository, private readonly Security $security) {}
 
     /**
      * @throws Exception

diff --git a/src/Service/ForumService.php b/src/Service/ForumService.php
@@ -9,9 +9,7 @@
 
 class ForumService
 {
-    public function __construct(private readonly EntityManagerInterface $em)
-    {
-    }
+    public function __construct(private readonly EntityManagerInterface $em) {}
 
     public function lock(Forum $forum): void
     {

diff --git a/src/Service/MessageLikeService.php b/src/Service/MessageLikeService.php
@@ -13,9 +13,7 @@
 
 class MessageLikeService
 {
-    public function __construct(private readonly Security $security, private readonly EntityManagerInterface $em, private readonly MessageLikeRepository $likeRepository)
-    {
-    }
+    public function __construct(private readonly Security $security, private readonly EntityManagerInterface $em, private readonly MessageLikeRepository $likeRepository) {}
 
     public function likeMessage(Message $message): void
     {

diff --git a/src/Service/OptionService.php b/src/Service/OptionService.php
@@ -13,9 +13,7 @@ class OptionService
     /** @var CoreOption[] */
     private array $cache = [];
 
-    public function __construct(private readonly EntityManagerInterface $em, private readonly CoreOptionRepository $coreOptionRepository)
-    {
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly CoreOptionRepository $coreOptionRepository) {}
 
     public function get(string $optionName, string $default = null): ?string
     {

diff --git a/src/Service/ReportService.php b/src/Service/ReportService.php
@@ -12,9 +12,7 @@
 
 class ReportService
 {
-    public function __construct(private readonly EntityManagerInterface $em)
-    {
-    }
+    public function __construct(private readonly EntityManagerInterface $em) {}
 
     public function createReport(Message $message, string $reason): void
     {

diff --git a/src/Service/ThreadService.php b/src/Service/ThreadService.php
@@ -19,7 +19,7 @@ class ThreadService
 {
     private readonly FlashBagInterface $flashBag;
 
-    public function __construct(private readonly EntityManagerInterface $em, private readonly MessageRepository $messageRepository, RequestStack $requestStack, private readonly AntispamService $antispamService, private readonly OptionService $optionService, private TranslatorInterface $translator)
+    public function __construct(private readonly EntityManagerInterface $em, private readonly MessageRepository $messageRepository, RequestStack $requestStack, private readonly AntispamService $antispamService, private readonly OptionService $optionService, private readonly TranslatorInterface $translator)
     {
         $this->flashBag = $requestStack->getSession()->getFlashBag();
     }

diff --git a/src/Service/UserService.php b/src/Service/UserService.php
@@ -9,9 +9,7 @@
 
 class UserService
 {
-    public function __construct(private readonly EntityManagerInterface $em, private readonly ThreadService $threadService, private readonly MessageService $messageService, private readonly ReportService $reportService)
-    {
-    }
+    public function __construct(private readonly EntityManagerInterface $em, private readonly ThreadService $threadService, private readonly MessageService $messageService, private readonly ReportService $reportService) {}
 
     public function deleteUser(User $user, bool $deleteContent = false): void
     {

diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php
@@ -11,9 +11,7 @@
 
 class AppExtension extends AbstractExtension
 {
-    public function __construct(private readonly UrlGeneratorInterface $urlGenerator, private readonly RequestStack $request)
-    {
-    }
+    public function __construct(private readonly UrlGeneratorInterface $urlGenerator, private readonly RequestStack $request) {}
 
     /**
      * @return array|TwigFunction[]

diff --git a/src/Twig/BreadcrumbExtension.php b/src/Twig/BreadcrumbExtension.php
@@ -16,9 +16,7 @@ class BreadcrumbExtension extends AbstractExtension
 {
     private array $breadcrumbsPaths = [];
 
-    public function __construct(private readonly UrlGeneratorInterface $urlGenerator)
-    {
-    }
+    public function __construct(private readonly UrlGeneratorInterface $urlGenerator) {}
 
     /**
      * @return array|TwigFilter[]

diff --git a/src/Twig/UserExtenion.php b/src/Twig/UserExtenion.php
@@ -16,9 +16,7 @@ class UserExtenion extends AbstractExtension
         'ROLE_MODERATOR' => 'Modérateur',
     ];
 
-    public function __construct(private readonly UrlGeneratorInterface $urlGenerator)
-    {
-    }
+    public function __construct(private readonly UrlGeneratorInterface $urlGenerator) {}
 
     /**
      * @return array|TwigFunction[]