Rename Repository/EntityRepository in Repository

diff --git a/Repository/EntityRepository.php b/Repository.php
similarity index 71%
rename from Repository/EntityRepository.php
rename to Repository.php
index db1921c97d466a970565b1dd651f48b2a381cd51..b21b0ca90f87819866419346f01b13533cf5b6c5 100644 (file)
--- a/Repository/EntityRepository.php
+++ b/Repository.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Rapsys\UserBundle\Repository;
+namespace Rapsys\UserBundle;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository as BaseEntityRepository;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -20,25 +20,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Rapsys\PackBundle\Util\SluggerUtil;
 
 /**
- * EntityRepository
+ * Repository
  *
  * {@inheritdoc}
  */
-class EntityRepository extends BaseEntityRepository {
-       /**
-        * The RouterInterface instance
-        *
-        * @var RouterInterface
-        */
-       protected RouterInterface $router;
-
-       /**
-        * The SluggerUtil instance
-        *
-        * @var SluggerUtil
-        */
-       protected SluggerUtil $slugger;
-
+class Repository extends EntityRepository {
        /**
         * The table keys array
         *
@@ -53,27 +39,6 @@ class EntityRepository extends BaseEntityRepository {
         */
        protected array $tableValues;
 
-       /**
-        * The TranslatorInterface instance
-        *
-        * @var TranslatorInterface
-        */
-       protected TranslatorInterface $translator;
-
-       /**
-        * The list of languages
-        *
-        * @var string[]
-        */
-       protected array $languages = [];
-
-       /**
-        * The current locale
-        *
-        * @var string
-        */
-       protected string $locale;
-
        /**
         * Initializes a new LocationRepository instance
         *
@@ -82,28 +47,12 @@ class EntityRepository extends BaseEntityRepository {
         * @param RouterInterface $router The router instance
         * @param SluggerUtil $slugger The SluggerUtil instance
         * @param TranslatorInterface $translator The TranslatorInterface instance
-        * @param array $languages The languages list
         * @param string $locale The current locale
         */
-       public function __construct(EntityManagerInterface $manager, ClassMetadata $class, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, array $languages, string $locale) {
+       public function __construct(protected EntityManagerInterface $manager, protected ClassMetadata $class, protected RouterInterface $router, protected SluggerUtil $slugger, protected TranslatorInterface $translator, protected string $locale) {
                //Call parent constructor
                parent::__construct($manager, $class);
 
-               //Set languages
-               $this->languages = $languages;
-
-               //Set locale
-               $this->locale = $locale;
-
-               //Set router
-               $this->router = $router;
-
-               //Set slugger
-               $this->slugger = $slugger;
-
-               //Set translator
-               $this->translator = $translator;
-
                //Get quote strategy
                $qs = $manager->getConfiguration()->getQuoteStrategy();
                $dp = $manager->getConnection()->getDatabasePlatform();

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index da5952fa5a05bba066c634e3740f5ddc10e7c072..db4d84e5cdff0e32df9b54f17ff0203f979b5539 100644 (file)
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -16,10 +16,12 @@ 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
  */
-class UserRepository extends EntityRepository implements PasswordUpgraderInterface {
+class UserRepository extends Repository implements PasswordUpgraderInterface {
        /**
         * Find user count as int
         *