Cleanup

diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php
index 7ea72ffceebfa00361c85be369cfef90d8589951..dc1e531046993e3bfad695122aa0dc612b782b5b 100644 (file)
--- a/Checker/UserChecker.php
+++ b/Checker/UserChecker.php
@@ -11,13 +11,13 @@
 
 namespace Rapsys\UserBundle\Checker;
 
 
 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 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}
  */
 /**
  * {@inheritdoc}
  */

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 9f771e6ff443954a984d7f0efcd2e00f75661b86..043a9594dec9d9d235fea05a6d0223edd2127c62 100644 (file)
--- 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 Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 

+use Rapsys\PackBundle\Util\SluggerUtil;
+
+use Rapsys\UserBundle\RapsysUserBundle;
+

 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 


@@ -36,10 +40,6 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 use Twig\Environment;
 
 
 use Twig\Environment;
 

-use Rapsys\PackBundle\Util\SluggerUtil;
-
-use Rapsys\UserBundle\RapsysUserBundle;
-

 /**
  * {@inheritdoc}
  *
 /**
  * {@inheritdoc}
  *

diff --git a/Controller/UserController.php b/Controller/UserController.php
index fe96dfd9eb19628b6af8a2c2a49fb0f8d25dd5b4..73f02ea03c446ebea2195177d259049287be597f 100644 (file)
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -12,6 +12,9 @@
 namespace Rapsys\UserBundle\Controller;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 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;
 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 Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 

-use Rapsys\UserBundle\RapsysUserBundle;
-

 /**
  * {@inheritdoc}
  */
 /**
  * {@inheritdoc}
  */

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 80a35526834a682611176b9eb1bd0dfa55c965e0..28f6fc2e86ca780d564373ccd1ff42910fd47de1 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,11 +11,11 @@
 
 namespace Rapsys\UserBundle\DependencyInjection;
 
 
 namespace Rapsys\UserBundle\DependencyInjection;
 

+use Rapsys\UserBundle\RapsysUserBundle;
+

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

-use Rapsys\UserBundle\RapsysUserBundle;
-

 /**
  * {@inheritdoc}
  *
 /**
  * {@inheritdoc}
  *

diff --git a/DependencyInjection/RapsysUserExtension.php b/DependencyInjection/RapsysUserExtension.php
index 5f92c1072bb2fad000e12e4ee9b12b9f4790deed..d69ee4df0405b10f6d50fb3e04a7e7343a77cd57 100644 (file)
--- a/DependencyInjection/RapsysUserExtension.php
+++ b/DependencyInjection/RapsysUserExtension.php
@@ -11,11 +11,11 @@
 
 namespace Rapsys\UserBundle\DependencyInjection;
 
 
 namespace Rapsys\UserBundle\DependencyInjection;
 

+use Rapsys\UserBundle\RapsysUserBundle;
+

 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 
 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.
  *
 /**
  * This is the class that loads and manages your bundle configuration.
  *

diff --git a/Entity/User.php b/Entity/User.php
index 445c3bdddec00fd78e55481942f09c167648dae3..5220e77dd0bec6410bc184ef0dd487e1ac433e46 100644 (file)
--- 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 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 Rapsys\UserBundle\Entity\Civility;
 use Rapsys\UserBundle\Entity\Group;
 

+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+

 /**
  * User
  */
 /**
  * User
  */

diff --git a/Factory.php b/Factory.php
index abfbc5f1a4f6787d4af9b63f415709685baf2e22..f051772e0a6007bb354f49909fa8646154f3393b 100644 (file)
--- 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 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 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.
  */
 /**
  * This factory is used to create default repository objects for entities at runtime.
  */

diff --git a/Handler/AuthenticationFailureHandler.php b/Handler/AuthenticationFailureHandler.php
index 01a4b12e5a79d8bd201f345b044327e160daba30..7e7c132ad9b857fa6b8cb85fe574c9e768a51e18 100644 (file)
--- a/Handler/AuthenticationFailureHandler.php
+++ b/Handler/AuthenticationFailureHandler.php
@@ -15,6 +15,11 @@ use Doctrine\Persistence\ManagerRegistry;
 
 use Psr\Log\LoggerInterface;
 
 
 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;
 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 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}
  */
 /**
  * {@inheritdoc}
  */

diff --git a/Listener/LogoutListener.php b/Listener/LogoutListener.php
index 888d67011ca596e0af3170a9c0e8f1bfcbaa9a35..85612502875cd07f058013f02914440a5fa74950 100644 (file)
--- a/Listener/LogoutListener.php
+++ b/Listener/LogoutListener.php
@@ -11,6 +11,8 @@
 
 namespace Rapsys\UserBundle\Listener;
 
 
 namespace Rapsys\UserBundle\Listener;
 

+use Rapsys\UserBundle\RapsysUserBundle;
+

 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 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 Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Http\Event\LogoutEvent;
 

-use Rapsys\UserBundle\RapsysUserBundle;
-

 /**
  * {@inheritdoc}
  */
 /**
  * {@inheritdoc}
  */

diff --git a/Repository.php b/Repository.php
index c7a654b4cf5806cfeb6bbcb50cf4408d0a293856..44a585ad80d67d034383ca8ecb2a31b8b85fc090 100644 (file)
--- 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 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 Rapsys\PackBundle\Util\SluggerUtil;
 

+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+

 /**
  * {@inheritdoc}
  *
 /**
  * {@inheritdoc}
  *

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 9f45b95ad3fd70f82121265513d3aaa1e610929d..077b50073e3d78d8b32f087c803969e088dfd1c4 100644 (file)
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -12,12 +12,13 @@
 namespace Rapsys\UserBundle\Repository;
 
 use Doctrine\ORM\Query\ResultSetMapping;
 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 Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 

-use Rapsys\UserBundle\Repository;
-

 /**
  * UserRepository
  */
 /**
  * UserRepository
  */