Change type hit for MockObjects

Author: scheb

tests/Controller/FormControllerTest.php

@@ -37,16 +37,16 @@ class FormControllerTest extends TestCase
     private const CSRF_TOKEN_ID = 'csrf_token_id';
     private const LOGOUT_PATH = '/logout';
 
-    private MockObject|TokenStorageInterface $tokenStorage;
-    private MockObject|TwoFactorProviderRegistry $providerRegistry;
-    private MockObject|SessionInterface $session;
-    private MockObject|Request $request;
-    private MockObject|TwoFactorFormRendererInterface $formRenderer;
-    private MockObject|TwoFactorTokenInterface $twoFactorToken;
-    private MockObject|TwoFactorFirewallConfig $firewallConfig;
-    private MockObject|TwoFactorFirewallContext $twoFactorFirewallContext;
-    private MockObject|LogoutUrlGenerator $logoutUrlGenerator;
-    private MockObject|TrustedDeviceManagerInterface $trustedDeviceManager;
+    private MockObject&TokenStorageInterface $tokenStorage;
+    private MockObject&TwoFactorProviderRegistry $providerRegistry;
+    private MockObject&SessionInterface $session;
+    private MockObject&Request $request;
+    private MockObject&TwoFactorFormRendererInterface $formRenderer;
+    private MockObject&TwoFactorTokenInterface $twoFactorToken;
+    private MockObject&TwoFactorFirewallConfig $firewallConfig;
+    private MockObject&TwoFactorFirewallContext $twoFactorFirewallContext;
+    private MockObject&LogoutUrlGenerator $logoutUrlGenerator;
+    private MockObject&TrustedDeviceManagerInterface $trustedDeviceManager;
     private FormController $controller;
 
     protected function setUp(): void

tests/DependencyInjection/Factory/Security/TwoFactorFactoryTest.php

@@ -29,7 +29,7 @@ class TwoFactorFactoryTest extends TestCase
     private const CSRF_TOKEN_MANAGER_ID = 'csrf_token_manager_id';
     private const TWO_FACTOR_FIREWALL_CONFIG_ID = 'firewall_config_id';
 
-    private MockObject|TwoFactorServicesFactory $servicesFactory;
+    private MockObject&TwoFactorServicesFactory $servicesFactory;
     private TwoFactorFactory $factory;
     private ContainerBuilder $container;
 

tests/EventDispatcherTestHelper.php

@@ -11,7 +11,7 @@
 
 trait EventDispatcherTestHelper
 {
-    protected MockObject|EventDispatcherInterface $eventDispatcher;
+    protected MockObject&EventDispatcherInterface $eventDispatcher;
 
     protected function expectDispatchOneEvent(mixed $eventObjectAssertion, string $eventNameAssertion): void
     {

tests/Mailer/SymfonyAuthCodeMailerTest.php

@@ -15,7 +15,7 @@
 
 class SymfonyAuthCodeMailerTest extends TestCase
 {
-    private MockObject|MailerInterface $symfonyMailer;
+    private MockObject&MailerInterface $symfonyMailer;
     private SymfonyAuthCodeMailer $mailer;
 
     protected function setUp(): void

tests/Model/Persister/DoctrinePersisterTest.php

@@ -13,7 +13,7 @@
 
 class DoctrinePersisterTest extends TestCase
 {
-    private MockObject|ObjectManager $objectManager;
+    private MockObject&ObjectManager $objectManager;
     private DoctrinePersister $persister;
 
     protected function setUp(): void

tests/Security/Authentication/AuthenticationTrustResolverTest.php

@@ -15,7 +15,7 @@
 
 class AuthenticationTrustResolverTest extends TestCase
 {
-    private MockObject|AuthenticationTrustResolverInterface $decoratedTrustResolver;
+    private MockObject&AuthenticationTrustResolverInterface $decoratedTrustResolver;
     private AuthenticationTrustResolver $trustResolver;
 
     protected function setUp(): void

tests/Security/Authorization/TwoFactorAccessDeciderTest.php

@@ -26,12 +26,12 @@ class TwoFactorAccessDeciderTest extends TestCase
     private const LOGOUT_PATH_WITH_BASE_URL = self::BASE_URL.self::LOGOUT_PATH;
     private const ACCESS_MAP_ATTRIBUTES = [TwoFactorInProgressVoter::IS_AUTHENTICATED_2FA_IN_PROGRESS];
 
-    private MockObject|Request $request;
-    private MockObject|TokenInterface $token;
-    private MockObject|AccessMapInterface $accessMap;
-    private MockObject|AccessDecisionManagerInterface $accessDecisionManager;
-    private MockObject|HttpUtils $httpUtils;
-    private MockObject|LogoutUrlGenerator $logoutUrlGenerator;
+    private MockObject&Request $request;
+    private MockObject&TokenInterface $token;
+    private MockObject&AccessMapInterface $accessMap;
+    private MockObject&AccessDecisionManagerInterface $accessDecisionManager;
+    private MockObject&HttpUtils $httpUtils;
+    private MockObject&LogoutUrlGenerator $logoutUrlGenerator;
     private TwoFactorAccessDecider $accessDecider;
 
     /** @var string[]|null */

tests/Security/Http/Authentication/DefaultAuthenticationFailureHandlerTest.php

@@ -20,11 +20,11 @@ class DefaultAuthenticationFailureHandlerTest extends TestCase
 {
     private const AUTH_FORM_PATH = '/auth_form_path';
 
-    private MockObject|HttpUtils $httpUtils;
-    private MockObject|TwoFactorFirewallConfig $twoFactorFirewallConfig;
+    private MockObject&HttpUtils $httpUtils;
+    private MockObject&TwoFactorFirewallConfig $twoFactorFirewallConfig;
     private DefaultAuthenticationFailureHandler $failureHandler;
-    private MockObject|Request $request;
-    private MockObject|SessionInterface $session;
+    private MockObject&Request $request;
+    private MockObject&SessionInterface $session;
 
     protected function setUp(): void
     {

tests/Security/Http/Authentication/DefaultAuthenticationRequiredHandlerTest.php

@@ -22,11 +22,11 @@ class DefaultAuthenticationRequiredHandlerTest extends TestCase
     private const OTHER_PATH = '/otherPath';
     private const FIREWALL_NAME = 'firewallName';
 
-    private MockObject|HttpUtils $httpUtils;
-    private MockObject|TwoFactorFirewallConfig $twoFactorFirewallConfig;
-    private MockObject|Request $request;
+    private MockObject&HttpUtils $httpUtils;
+    private MockObject&TwoFactorFirewallConfig $twoFactorFirewallConfig;
+    private MockObject&Request $request;
     private DefaultAuthenticationRequiredHandler $handler;
-    private MockObject|RedirectResponse $authFormRedirectResponse;
+    private MockObject&RedirectResponse $authFormRedirectResponse;
 
     protected function setUp(): void
     {

tests/Security/Http/Authentication/DefaultAuthenticationSuccessHandlerTest.php

@@ -22,11 +22,11 @@ class DefaultAuthenticationSuccessHandlerTest extends TestCase
     private const DEFAULT_TARGET_PATH = '/defaultTargetPath';
     private const SESSION_TARGET_PATH = '/sessionTargetPath';
 
-    private MockObject|HttpUtils $httpUtils;
-    private MockObject|TwoFactorFirewallConfig $twoFactorFirewallConfig;
+    private MockObject&HttpUtils $httpUtils;
+    private MockObject&TwoFactorFirewallConfig $twoFactorFirewallConfig;
     private DefaultAuthenticationSuccessHandler $successHandler;
-    private MockObject|Request $request;
-    private MockObject|SessionInterface $session;
+    private MockObject&Request $request;
+    private MockObject&SessionInterface $session;
 
     protected function setUp(): void
     {