Merge branch hotfix/v2.3.19

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2023 Ambroise Maupate
+Copyright © 2024 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

composer.json

@@ -17,29 +17,34 @@
         }
     ],
     "type": "symfony-bundle",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=8.1",
-        "doctrine/orm": "~2.17.0",
+        "doctrine/orm": "~2.19.0",
         "endroid/qr-code": "^4.0",
-        "roadiz/core-bundle": "2.2.*",
-        "roadiz/rozier-bundle": "2.2.*",
-        "roadiz/rozier": "2.2.*",
+        "roadiz/core-bundle": "2.3.*",
+        "roadiz/rozier-bundle": "2.3.*",
+        "roadiz/rozier": "2.3.*",
         "scheb/2fa-backup-code": "^6.8",
         "scheb/2fa-bundle": "^6.8",
         "scheb/2fa-totp": "^6.8",
         "scheb/2fa-google-authenticator": "^6.8",
         "scheb/2fa-trusted-device": "^6.8",
         "sensio/framework-extra-bundle": "^6.1",
-        "symfony/framework-bundle": "5.4.*"
+        "symfony/framework-bundle": "6.4.*"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.4",
         "phpstan/phpstan": "^1.5.3",
         "phpstan/phpstan-doctrine": "^1.3",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/stopwatch": "5.4.*"
+        "symfony/stopwatch": "6.4.*",
+        "roadiz/entity-generator": "2.3.*",
+        "roadiz/doc-generator": "2.3.*",
+        "roadiz/random": "2.3.*",
+        "roadiz/jwt": "2.3.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -66,8 +71,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.x-dev",
-            "dev-develop": "2.3.x-dev"
+            "dev-main": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }

phpstan.neon

@@ -1,12 +1,14 @@
 parameters:
-    level: 5
+    level: 7
     paths:
         - src
     excludePaths:
         - */node_modules/*
         - */bower_components/*
         - */static/*
     ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
         - '#Call to an undefined method RZ\\Roadiz\\CoreBundle\\Repository#'
         - '#Call to an undefined method RZ\\Roadiz\\UserBundle\\Repository#'
         - '#Call to an undefined method Doctrine\\Persistence\\ObjectRepository#'
@@ -28,7 +30,5 @@ parameters:
         - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
 
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
 includes:
     - vendor/phpstan/phpstan-doctrine/extension.neon

src/Backup/BackupCodeManager.php

@@ -13,8 +13,8 @@
 final class BackupCodeManager implements BackupCodeManagerInterface
 {
     public function __construct(
-        private TwoFactorUserProviderInterface $twoFactorUserProvider,
-        private PersisterInterface $persister
+        private readonly TwoFactorUserProviderInterface $twoFactorUserProvider,
+        private readonly PersisterInterface $persister
     ) {
     }
 

src/Console/DisableTwoFactorUserCommand.php

@@ -4,10 +4,7 @@
 
 namespace RZ\Roadiz\TwoFactorBundle\Console;
 
-use Doctrine\Persistence\ManagerRegistry;
-use RZ\Roadiz\CoreBundle\Console\UsersCommand;
 use RZ\Roadiz\TwoFactorBundle\Entity\TwoFactorUser;
-use RZ\Roadiz\TwoFactorBundle\Security\Provider\TwoFactorUserProviderInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -20,18 +17,6 @@
 )]
 final class DisableTwoFactorUserCommand extends UsersCommand
 {
-    private TwoFactorUserProviderInterface $twoFactorUserProvider;
-
-    public function __construct(
-        ManagerRegistry $managerRegistry,
-        TwoFactorUserProviderInterface $twoFactorUserProvider,
-        string $name = null
-    ) {
-        parent::__construct($managerRegistry, $name);
-        $this->twoFactorUserProvider = $twoFactorUserProvider;
-        $this->managerRegistry = $managerRegistry;
-    }
-
     protected function configure(): void
     {
         $this->addArgument(

src/Console/UsersCommand.php

@@ -13,17 +13,14 @@
     name: 'users:list',
     description: 'List all users or just one'
 )]
-final class UsersCommand extends \RZ\Roadiz\CoreBundle\Console\UsersCommand
+class UsersCommand extends \RZ\Roadiz\CoreBundle\Console\UsersCommand
 {
-    private TwoFactorUserProviderInterface $twoFactorUserProvider;
-
     public function __construct(
-        TwoFactorUserProviderInterface $twoFactorUserProvider,
+        protected readonly TwoFactorUserProviderInterface $twoFactorUserProvider,
         ManagerRegistry $managerRegistry,
         string $name = null
     ) {
         parent::__construct($managerRegistry, $name);
-        $this->twoFactorUserProvider = $twoFactorUserProvider;
     }
 
     protected function getUserTableRow(User $user): array

src/Controller/BackupCodesAdminController.php

@@ -6,7 +6,6 @@
 
 use RZ\Roadiz\CoreBundle\Entity\User;
 use RZ\Roadiz\TwoFactorBundle\Entity\TwoFactorUser;
-use RZ\Roadiz\TwoFactorBundle\Security\Provider\AuthenticatorTwoFactorProvider;
 use RZ\Roadiz\TwoFactorBundle\Security\Provider\TwoFactorUserProviderInterface;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,7 +16,7 @@
 final class BackupCodesAdminController extends RozierApp
 {
     public function __construct(
-        private TwoFactorUserProviderInterface $twoFactorUserProvider
+        private readonly TwoFactorUserProviderInterface $twoFactorUserProvider
     ) {
     }
 

src/Controller/QrCodeController.php

@@ -22,9 +22,9 @@
 final class QrCodeController extends AbstractController
 {
     public function __construct(
-        private TwoFactorUserProviderInterface $twoFactorUserProvider,
-        private TotpAuthenticatorInterface $totpAuthenticator,
-        private GoogleAuthenticatorInterface $googleAuthenticator
+        private readonly TwoFactorUserProviderInterface $twoFactorUserProvider,
+        private readonly TotpAuthenticatorInterface $totpAuthenticator,
+        private readonly GoogleAuthenticatorInterface $googleAuthenticator
     ) {
     }
 

src/Controller/TwoFactorAdminController.php

@@ -21,8 +21,8 @@
 final class TwoFactorAdminController extends RozierApp
 {
     public function __construct(
-        private TwoFactorUserProviderInterface $twoFactorUserProvider,
-        private AuthenticatorTwoFactorProvider $authenticatorTwoFactorProvider,
+        private readonly TwoFactorUserProviderInterface $twoFactorUserProvider,
+        private readonly AuthenticatorTwoFactorProvider $authenticatorTwoFactorProvider,
     ) {
     }
 

src/EventSubscriber/UserActionsMenuEventSubscriber.php

@@ -6,13 +6,15 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Bundle\SecurityBundle\Security;
 use Themes\Rozier\Event\UserActionsMenuEvent;
 
 final class UserActionsMenuEventSubscriber implements EventSubscriberInterface
 {
-    public function __construct(private UrlGeneratorInterface $urlGenerator, private Security $security)
-    {
+    public function __construct(
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly Security $security
+    ) {
     }
 
     public static function getSubscribedEvents(): array

src/Security/Provider/AuthenticatorTwoFactorProvider.php

@@ -16,9 +16,9 @@
 final class AuthenticatorTwoFactorProvider implements TwoFactorProviderInterface
 {
     public function __construct(
-        private TwoFactorUserProviderInterface $twoFactorUserProvider,
-        private TotpAuthenticatorInterface $authenticator,
-        private TwoFactorFormRendererInterface $formRenderer,
+        private readonly TwoFactorUserProviderInterface $twoFactorUserProvider,
+        private readonly TotpAuthenticatorInterface $authenticator,
+        private readonly TwoFactorFormRendererInterface $formRenderer,
     ) {
     }
 

src/Security/Provider/TwoFactorUserProvider.php

@@ -12,8 +12,8 @@
 final class TwoFactorUserProvider implements TwoFactorUserProviderInterface
 {
     public function __construct(
-        private ManagerRegistry $managerRegistry,
-        private TotpAuthenticatorInterface $totpAuthenticator
+        private readonly ManagerRegistry $managerRegistry,
+        private readonly TotpAuthenticatorInterface $totpAuthenticator
     ) {
     }