diff --git a/src/Security/Http/Logout/ContextInvalidationSessionLogoutHandler.php b/src/Security/Http/Logout/ContextInvalidationSessionLogoutHandler.php
index 28b8443b..5c48d6b7 100644
--- a/src/Security/Http/Logout/ContextInvalidationSessionLogoutHandler.php
+++ b/src/Security/Http/Logout/ContextInvalidationSessionLogoutHandler.php
@@ -32,4 +32,4 @@ public function onLogout(LogoutEvent $event): void
 
         parent::onLogout($event);
     }
-}
\ No newline at end of file
+}
diff --git a/src/UserContext/RoleProvider.php b/src/UserContext/RoleProvider.php
index 3023142e..1b43411f 100644
--- a/src/UserContext/RoleProvider.php
+++ b/src/UserContext/RoleProvider.php
@@ -14,10 +14,8 @@
 use FOS\HttpCache\UserContext\ContextProvider;
 use FOS\HttpCache\UserContext\UserContext;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Authentication\Token\NullToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * The RoleProvider adds roles to the UserContext for the hash generation.
diff --git a/tests/Functional/EventListener/FlashMessageListenerTest.php b/tests/Functional/EventListener/FlashMessageListenerTest.php
index 8e84b6f4..788768ac 100644
--- a/tests/Functional/EventListener/FlashMessageListenerTest.php
+++ b/tests/Functional/EventListener/FlashMessageListenerTest.php
@@ -13,7 +13,6 @@
 
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpKernel\Kernel;
 
 class FlashMessageListenerTest extends WebTestCase
 {
diff --git a/tests/Functional/EventListener/SwitchUserListenerTest.php b/tests/Functional/EventListener/SwitchUserListenerTest.php
index ee3019dc..d8131da7 100644
--- a/tests/Functional/EventListener/SwitchUserListenerTest.php
+++ b/tests/Functional/EventListener/SwitchUserListenerTest.php
@@ -82,7 +82,7 @@ public function loginAsAdmin(KernelBrowser $client)
 
         $user = $this->createAdminUser();
 
-        $token = new UsernamePasswordToken($user,  self::FIREWALL_NAME, $user->getRoles());
+        $token = new UsernamePasswordToken($user, self::FIREWALL_NAME, $user->getRoles());
         $session->set('_security_'.self::FIREWALL_NAME, serialize($token));
         $session->save();
 
diff --git a/tests/Unit/EventListener/CacheControlListenerTest.php b/tests/Unit/EventListener/CacheControlListenerTest.php
index f28abda7..b56fd556 100755
--- a/tests/Unit/EventListener/CacheControlListenerTest.php
+++ b/tests/Unit/EventListener/CacheControlListenerTest.php
@@ -425,8 +425,6 @@ protected function buildEvent(string $method = 'GET'): ResponseEvent
      * We mock a rule matcher for tests about applying the rules.
      *
      * @param array $headers The headers to return from the matcher
-     *
-     * @return MockObject|CacheControlListener
      */
     protected function getCacheControl(array $headers): CacheControlListener|MockObject
     {