From: Raphaƫl Gertz Date: Tue, 27 Feb 2024 13:13:39 +0000 (+0100) Subject: Rename Factory/RepositoryFactory in Factory X-Git-Tag: 0.4.0~35 X-Git-Url: https://git.rapsys.eu/userbundle/commitdiff_plain/7b065b7bc56a349a0e70f455ec90a91faea8acf9?hp=098b66c569cab0032e63f1140dc2c687d4394da9 Rename Factory/RepositoryFactory in Factory Remove languages argument --- diff --git a/Factory/RepositoryFactory.php b/Factory.php similarity index 65% rename from Factory/RepositoryFactory.php rename to Factory.php index 0de0e0a..3c5f3d6 100644 --- a/Factory/RepositoryFactory.php +++ b/Factory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Rapsys\UserBundle\Factory; +namespace Rapsys\UserBundle; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Repository\RepositoryFactory as RepositoryFactoryInterface; @@ -23,56 +23,12 @@ use Rapsys\PackBundle\Util\SluggerUtil; /** * This factory is used to create default repository objects for entities at runtime. */ -final class RepositoryFactory implements RepositoryFactoryInterface { +final class Factory implements RepositoryFactoryInterface { /** * The list of EntityRepository instances - * - * @var array */ private array $repositoryList = []; - /** - * The list of languages - * - * @var array - */ - private array $languages = []; - - /** - * The current locale - * - * @var string - */ - private string $locale; - - /** - * The RequestStack instance - * - * @var RequestStack - */ - private RequestStack $request; - - /** - * The RouterInterface instance - * - * @var RouterInterface - */ - private RouterInterface $router; - - /** - * The SluggerUtil instance - * - * @var SluggerUtil - */ - private SluggerUtil $slugger; - - /** - * The TranslatorInterface instance - * - * @var TranslatorInterface - */ - private TranslatorInterface $translator; - /** * Initializes a new RepositoryFactory instance * @@ -80,27 +36,9 @@ final class RepositoryFactory implements RepositoryFactoryInterface { * @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(RequestStack $request, RouterInterface $router, SluggerUtil $slugger, TranslatorInterface $translator, array $languages, string $locale) { - //Set request - $this->request = $request; - - //Set router - $this->router = $router; - - //Set slugger - $this->slugger = $slugger; - - //Set translator - $this->translator = $translator; - - //Set languages - $this->languages = $languages; - - //Set locale - $this->locale = $locale; + public function __construct(private RequestStack $request, private RouterInterface $router, private SluggerUtil $slugger, private TranslatorInterface $translator, private string $locale) { } /** @@ -138,7 +76,7 @@ final class RepositoryFactory implements RepositoryFactoryInterface { $this->locale = $this->request->getCurrentRequest()->getLocale() ?? $this->locale; //Return repository class instance - //XXX: router, slugger, translator, languages and locale arguments will be ignored by default - return new $repositoryClass($entityManager, $metadata, $this->router, $this->slugger, $this->translator, $this->languages, $this->locale); + //XXX: router, slugger, translator and locale arguments will be ignored by default + return new $repositoryClass($entityManager, $metadata, $this->router, $this->slugger, $this->translator, $this->locale); } }