From 0811e272814cf05d6fc8bc76646a0be99bf79bb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 26 Mar 2024 19:13:55 +0100 Subject: [PATCH] Cleanup --- Checker/UserChecker.php | 6 +++--- Controller/AbstractController.php | 8 ++++---- Controller/UserController.php | 5 +++-- DependencyInjection/Configuration.php | 4 ++-- DependencyInjection/RapsysUserExtension.php | 4 ++-- Entity/User.php | 6 +++--- Factory.php | 4 ++-- Handler/AuthenticationFailureHandler.php | 10 +++++----- Listener/LogoutListener.php | 4 ++-- Repository.php | 5 +++-- Repository/UserRepository.php | 5 +++-- 11 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php index 7ea72ff..dc1e531 100644 --- a/Checker/UserChecker.php +++ b/Checker/UserChecker.php @@ -11,13 +11,13 @@ namespace Rapsys\UserBundle\Checker; +use Rapsys\UserBundle\Entity\User; +use Rapsys\UserBundle\Exception\UnactivatedException; + use Symfony\Component\Security\Core\User\InMemoryUserChecker; use Symfony\Component\Security\Core\Exception\DisabledException; use Symfony\Component\Security\Core\User\UserInterface; -use Rapsys\UserBundle\Entity\User; -use Rapsys\UserBundle\Exception\UnactivatedException; - /** * {@inheritdoc} */ diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php index 9f771e6..043a959 100644 --- a/Controller/AbstractController.php +++ b/Controller/AbstractController.php @@ -14,6 +14,10 @@ namespace Rapsys\UserBundle\Controller; use Doctrine\ORM\EntityManagerInterface; use Doctrine\Persistence\ManagerRegistry; +use Rapsys\PackBundle\Util\SluggerUtil; + +use Rapsys\UserBundle\RapsysUserBundle; + use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; @@ -36,10 +40,6 @@ use Symfony\Contracts\Translation\TranslatorInterface; use Twig\Environment; -use Rapsys\PackBundle\Util\SluggerUtil; - -use Rapsys\UserBundle\RapsysUserBundle; - /** * {@inheritdoc} * diff --git a/Controller/UserController.php b/Controller/UserController.php index fe96dfd..73f02ea 100644 --- a/Controller/UserController.php +++ b/Controller/UserController.php @@ -12,6 +12,9 @@ namespace Rapsys\UserBundle\Controller; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; + +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Form\FormError; use Symfony\Component\HttpFoundation\Request; @@ -22,8 +25,6 @@ use Symfony\Component\Mime\Address; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; -use Rapsys\UserBundle\RapsysUserBundle; - /** * {@inheritdoc} */ diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 80a3552..28f6fc2 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -11,11 +11,11 @@ namespace Rapsys\UserBundle\DependencyInjection; +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; -use Rapsys\UserBundle\RapsysUserBundle; - /** * {@inheritdoc} * diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php index 5f92c10..d69ee4d 100644 --- a/DependencyInjection/RapsysUserExtension.php +++ b/DependencyInjection/RapsysUserExtension.php @@ -11,11 +11,11 @@ namespace Rapsys\UserBundle\DependencyInjection; +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; -use Rapsys\UserBundle\RapsysUserBundle; - /** * This is the class that loads and manages your bundle configuration. * diff --git a/Entity/User.php b/Entity/User.php index 445c3bd..5220e77 100644 --- a/Entity/User.php +++ b/Entity/User.php @@ -15,12 +15,12 @@ use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Event\PreUpdateEventArgs; -use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; - use Rapsys\UserBundle\Entity\Civility; use Rapsys\UserBundle\Entity\Group; +use Symfony\Component\Security\Core\User\UserInterface; +use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; + /** * User */ diff --git a/Factory.php b/Factory.php index abfbc5f..f051772 100644 --- a/Factory.php +++ b/Factory.php @@ -15,12 +15,12 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Repository\RepositoryFactory as RepositoryFactoryInterface; use Doctrine\Persistence\ObjectRepository; +use Rapsys\PackBundle\Util\SluggerUtil; + use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Routing\RouterInterface; use Symfony\Contracts\Translation\TranslatorInterface; -use Rapsys\PackBundle\Util\SluggerUtil; - /** * This factory is used to create default repository objects for entities at runtime. */ diff --git a/Handler/AuthenticationFailureHandler.php b/Handler/AuthenticationFailureHandler.php index 01a4b12..7e7c132 100644 --- a/Handler/AuthenticationFailureHandler.php +++ b/Handler/AuthenticationFailureHandler.php @@ -15,6 +15,11 @@ use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; +use Rapsys\PackBundle\Util\SluggerUtil; + +use Rapsys\UserBundle\Exception\UnactivatedException; +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -37,11 +42,6 @@ use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureH use Symfony\Component\Security\Http\HttpUtils; use Symfony\Contracts\Translation\TranslatorInterface; -use Rapsys\PackBundle\Util\SluggerUtil; - -use Rapsys\UserBundle\Exception\UnactivatedException; -use Rapsys\UserBundle\RapsysUserBundle; - /** * {@inheritdoc} */ diff --git a/Listener/LogoutListener.php b/Listener/LogoutListener.php index 888d670..8561250 100644 --- a/Listener/LogoutListener.php +++ b/Listener/LogoutListener.php @@ -11,6 +11,8 @@ namespace Rapsys\UserBundle\Listener; +use Rapsys\UserBundle\RapsysUserBundle; + use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -23,8 +25,6 @@ use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Security\Http\Event\LogoutEvent; -use Rapsys\UserBundle\RapsysUserBundle; - /** * {@inheritdoc} */ diff --git a/Repository.php b/Repository.php index c7a654b..44a585a 100644 --- a/Repository.php +++ b/Repository.php @@ -14,11 +14,12 @@ namespace Rapsys\UserBundle; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Mapping\ClassMetadata; -use Symfony\Component\Routing\RouterInterface; -use Symfony\Contracts\Translation\TranslatorInterface; use Rapsys\PackBundle\Util\SluggerUtil; +use Symfony\Component\Routing\RouterInterface; +use Symfony\Contracts\Translation\TranslatorInterface; + /** * {@inheritdoc} * diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php index 9f45b95..077b500 100644 --- a/Repository/UserRepository.php +++ b/Repository/UserRepository.php @@ -12,12 +12,13 @@ namespace Rapsys\UserBundle\Repository; use Doctrine\ORM\Query\ResultSetMapping; + +use Rapsys\UserBundle\Repository; + use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\PasswordUpgraderInterface; -use Rapsys\UserBundle\Repository; - /** * UserRepository */ -- 2.41.0