PHP 8 support

.github/workflows/test.yaml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.1'
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"

.gitignore

@@ -5,7 +5,8 @@
 /nbproject/
 .DS_Store
 Thumbs.db
-/.php_cs.cache
+/.php-cs-fixer.cache
+/.phpunit.result.cache
 Tests/Fixtures/TestProject/bower.json
 Tests/Fixtures/TestProject/.bowerrc
 Tests/Fixtures/TestProject/web/bundles

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
@@ -11,15 +11,14 @@
         'combine_consecutive_unsets' => true,
         'concat_space' => ['spacing' => 'one'],
         'declare_strict_types' => true,
-        'dir_constant' => true,
         'ereg_to_preg' => true,
         'heredoc_to_nowdoc' => true,
         'include' => true,
         'lowercase_cast' => true,
         'magic_constant_casing' => true,
         'modernize_types_casting' => true,
         'native_function_casing' => true,
-        'native_function_invocation' => true,
+        'native_function_invocation' => ['strict' => false],
         'new_with_braces' => true,
         'no_alias_functions' => true,
         'no_blank_lines_after_class_opening' => true,
@@ -28,17 +27,16 @@
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
+        'no_extra_blank_lines' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_mixed_echo_print' => true,
         'no_multiline_whitespace_around_double_arrow' => true,
-        'no_multiline_whitespace_before_semicolons' => true,
+        'multiline_whitespace_before_semicolons' => false,
         'no_php4_constructor' => true,
         'no_singleline_whitespace_before_semicolons' => true,
         'no_spaces_around_offset' => true,
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unneeded_control_parentheses' => true,
         'no_unneeded_curly_braces' => true,
         'no_unused_imports' => true,
@@ -64,7 +62,7 @@
         'phpdoc_to_comment' => true,
         'phpdoc_types' => true,
         'phpdoc_var_without_name' => true,
-        'psr4' => true,
+        'psr_autoloading' => true,
         'self_accessor' => true,
         'semicolon_after_instruction' => true,
         'short_scalar_cast' => true,
@@ -74,18 +72,16 @@
         'strict_comparison' => true,
         'strict_param' => true,
         'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
-        'void_return' => true,
         'whitespace_after_comma_in_array' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude([
                 'vendor',
-                'Tests/Fixtures/TestProject/var',
+                'tests/Fixtures/TestProject/var',
             ])
             ->in(__DIR__)
-    )
-;
+    );

Command/CommandUtil.php

@@ -6,8 +6,6 @@ class CommandUtil
     /**
      * Ensure that PHPExcel is available.
      *
-     * @param OutputInterface $output
-     *
      * @throws \RuntimeException
      */
     public static function checkPhpExcel(OutputInterface $output): void

Command/RoleDocumentCreateCommand.php

@@ -77,17 +77,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     }
 
     /**
-     * Get default roles.
-     *
-     * @param string|null $userName
-     * @param string|null $groupName
-     * @param bool|null   $defaultState
-     *
      * @throws \LogicException
-     *
-     * @return array|bool
      */
-    private function getDefaultRoles($userName, $groupName, $defaultState)
+    private function getDefaultRoles(?string $userName, ?string $groupName, ?bool $defaultState): array|bool
     {
         if ($userName xor $groupName) {
             if (null !== $defaultState) {
@@ -105,15 +97,9 @@ private function getDefaultRoles($userName, $groupName, $defaultState)
     }
 
     /**
-     * Get user roles.
-     *
-     * @param string $userName
-     *
      * @throws \RuntimeException
-     *
-     * @return array
      */
-    private function getUserRoles($userName)
+    private function getUserRoles(string $userName): array
     {
         $user = $this->userManager->findUserBy(['username' => $userName]);
         if (!$user) {
@@ -124,15 +110,9 @@ private function getUserRoles($userName)
     }
 
     /**
-     * Get group roles.
-     *
-     * @param string $groupName
-     *
      * @throws \RuntimeException
-     *
-     * @return array
      */
-    private function getGroupRoles($groupName)
+    private function getGroupRoles(string $groupName): array
     {
         $group = $this->groupManager->findGroupBy(['name' => $groupName]);
         if (!$group) {

Command/RoleDocumentImportCommand.php

@@ -10,23 +10,13 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-/**
- * Role document import command.
- *
- * @author Pavel Batecko <pavel.batecko@imatic.cz>
- */
 class RoleDocumentImportCommand extends Command
 {
-    private UserManager $userManager;
-    private GroupManager $groupManager;
-
     public function __construct(
-        UserManager $userManager,
-        GroupManager $groupManager
+        private UserManager $userManager,
+        private GroupManager $groupManager
     ) {
         parent::__construct();
-        $this->userManager = $userManager;
-        $this->groupManager = $groupManager;
     }
 
     /**
@@ -90,14 +80,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     }
 
     /**
-     * Apply roles to user.
-     *
-     * @param string $userName
-     * @param array  $roles
-     *
      * @throws \RuntimeException
      */
-    private function applyRolesToUser($userName, array $roles): void
+    private function applyRolesToUser(string $userName, array $roles): void
     {
         $user = $this->userManager->findUserBy(['username' => $userName]);
         if (!$user) {
@@ -109,14 +94,9 @@ private function applyRolesToUser($userName, array $roles): void
     }
 
     /**
-     * Apply roles to group.
-     *
-     * @param string $groupName
-     * @param array  $roles
-     *
      * @throws \RuntimeException
      */
-    private function applyRolesToGroup($groupName, array $roles): void
+    private function applyRolesToGroup(string $groupName, array $roles): void
     {
         $group = $this->groupManager->findGroupBy(['name' => $groupName]);
         if (!$group) {

Controller/ChangePasswordController.php

@@ -10,7 +10,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @Route("/profile", name="fos_user_")
+ * @Route("/profile", name="user_")
  */
 class ChangePasswordController extends AbstractController
 {
@@ -24,12 +24,12 @@ public function changePasswordAction(Request $request, UserManager $userManager)
             return $this->createAccessDeniedException();
         }
 
-        $form = $this->createForm(ChangePasswordType::class, $user);
+        $form = $this->createForm(ChangePasswordType::class, $user, ['data_class' => $user::class]);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $userManager->updateUser($user);
 
-            return new RedirectResponse($this->generateUrl('fos_user_profile_show'));
+            return new RedirectResponse($this->generateUrl('user_profile_show'));
         }
 
         return $this->render('@ImaticUser/ChangePassword/change_password.html.twig', [

Controller/ProfileController.php

@@ -9,14 +9,17 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
-/**
- * @Route("/profile", name="fos_user_profile_")
- */
+#[Route(
+    path: '/profile',
+    name: 'user_profile_',
+)]
 class ProfileController extends AbstractController
 {
-    /**
-     * @Route("/", methods={"GET"}, name="show")
-     */
+    #[Route(
+        path: '/',
+        methods: ['GET'],
+        name: 'show',
+    )]
     public function showAction()
     {
         $user = $this->getUser();
@@ -29,22 +32,25 @@ public function showAction()
         ]);
     }
 
-    /**
-     * @Route("/edit", methods={"GET", "POST"}, name="edit")
-     */
-    public function editAction(Request $request, UserManager $userManager)
+    #[Route(
+        path: '/edit',
+        methods: ['GET', 'POST'],
+        name: 'edit',
+    )]
+    public function editAction(Request $request, UserManager $userManager): \Symfony\Component\HttpFoundation\Response|RedirectResponse
     {
         $user = $this->getUser();
         if (!$user instanceof UserInterface) {
             $this->createAccessDeniedException();
         }
 
-        $form = $this->createForm(ProfileType::class, $user);
+        \assert($user instanceof UserInterface);
+        $form = $this->createForm(ProfileType::class, $user, ['data_class' => $user::class]);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $userManager->updateUser($user);
 
-            return new RedirectResponse($this->generateUrl('fos_user_profile_show'));
+            return new RedirectResponse($this->generateUrl('user_profile_show'));
         }
 
         return $this->render('@ImaticUser/Profile/edit.html.twig', [

Controller/ResettingController.php

@@ -10,7 +10,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @Route("/resetting", name="fos_user_resetting_")
+ * @Route("/resetting", name="user_resetting_")
  */
 class ResettingController extends AbstractController
 {
@@ -41,7 +41,7 @@ public function sendEmailAction(Request $request, UserManager $userManager, Mail
 
         if (null !== $user && !$user->isPasswordRequestNonExpired($this->retryTtl)) {
             if (!$user->isAccountNonLocked()) {
-                return new RedirectResponse($this->generateUrl('fos_user_resetting_request'));
+                return new RedirectResponse($this->generateUrl('user_resetting_request'));
             }
 
             if (null === $user->getConfirmationToken()) {
@@ -53,7 +53,7 @@ public function sendEmailAction(Request $request, UserManager $userManager, Mail
             $userManager->updateUser($user);
         }
 
-        return new RedirectResponse($this->generateUrl('fos_user_resetting_check_email', ['username' => $username]));
+        return new RedirectResponse($this->generateUrl('user_resetting_check_email', ['username' => $username]));
     }
 
     /**
@@ -64,7 +64,7 @@ public function checkEmailAction(Request $request)
         $username = $request->query->get('username');
 
         if (empty($username)) {
-            return new RedirectResponse($this->generateUrl('fos_user_resetting_request'));
+            return new RedirectResponse($this->generateUrl('user_resetting_request'));
         }
 
         return $this->render('@ImaticUser/Resetting/check_email.html.twig', [
@@ -79,11 +79,11 @@ public function resetAction(Request $request, $token, UserManager $userManager)
     {
         $user = $userManager->findUserByConfirmationToken($token);
         if (null === $user) {
-            return new RedirectResponse($this->generateUrl('fos_user_security_login'));
+            return new RedirectResponse($this->generateUrl('user_security_login'));
         }
 
         if (!$user->isPasswordRequestNonExpired($this->tokenTtl)) {
-            return new RedirectResponse($this->generateUrl('fos_user_resetting_request'));
+            return new RedirectResponse($this->generateUrl('user_resetting_request'));
         }
 
         $form = $this->createForm(ResettingFormType::class, $user);
@@ -94,7 +94,7 @@ public function resetAction(Request $request, $token, UserManager $userManager)
             $user->setEnabled(true);
             $userManager->updateUser($user);
 
-            return new RedirectResponse($this->generateUrl('fos_user_profile_show'));
+            return new RedirectResponse($this->generateUrl('user_profile_show'));
         }
 
         return $this->render('@ImaticUser/Resetting/reset.html.twig', [