X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/03a61db3b514d01a12408021db65dd8edfec0d86..10322ae4af3fb083421e618c6c8f4b8dc0575126:/Controller/AbstractController.php
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 19e4782..77cf860 100644
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -13,120 +13,106 @@ 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;
+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Service\ServiceSubscriberInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Environment;
-use Rapsys\PackBundle\Util\SluggerUtil;
-
-use Rapsys\UserBundle\RapsysUserBundle;
+use Twig\Environment;
/**
- * Provides common features needed in controllers.
- *
* {@inheritdoc}
+ *
+ * Provides common features needed in controllers.
*/
abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {
- ///Config array
+ /**
+ * Alias string
+ */
+ protected string $alias;
+
+ /**
+ * Config array
+ */
protected array $config;
- ///Context array
+ /**
+ * Context array
+ */
protected array $context;
- ///ManagerRegistry
- protected ManagerRegistry $doctrine;
-
- ///UserPasswordHasherInterface
- protected UserPasswordHasherInterface $hasher;
-
- ///LoggerInterface
- protected LoggerInterface $logger;
-
- ///MailerInterface
- protected MailerInterface $mailer;
-
- ///EntityManagerInterface
- protected EntityManagerInterface $manager;
-
- ///Router instance
- protected RouterInterface $router;
-
- ///Slugger util
- protected SluggerUtil $slugger;
-
- ///Translator instance
- protected TranslatorInterface $translator;
+ /**
+ * Locale string
+ */
+ protected string $locale;
- ///Twig\Environment instance
- protected Environment $twig;
+ /**
+ * Page integer
+ */
+ protected int $page;
- ///Locale
- protected string $locale;
+ /**
+ * Request instance
+ */
+ protected Request $request;
/**
* Abstract constructor
*
+ * @param CacheInterface $cache The cache instance
+ * @param AuthorizationCheckerInterface $checker The checker instance
* @param ContainerInterface $container The container instance
* @param ManagerRegistry $doctrine The doctrine instance
+ * @param FormFactoryInterface $factory The factory instance
* @param UserPasswordHasherInterface $hasher The password hasher instance
* @param LoggerInterface $logger The logger instance
* @param MailerInterface $mailer The mailer instance
* @param EntityManagerInterface $manager The manager instance
* @param RouterInterface $router The router instance
+ * @param Security $security The security instance
* @param SluggerUtil $slugger The slugger instance
* @param RequestStack $stack The stack instance
* @param TranslatorInterface $translator The translator instance
* @param Environment $twig The twig environment instance
+ * @param integer $limit The page limit
*/
- public function __construct(ContainerInterface $container, ManagerRegistry $doctrine, UserPasswordHasherInterface $hasher, LoggerInterface $logger, MailerInterface $mailer, EntityManagerInterface $manager, RouterInterface $router, SluggerUtil $slugger, RequestStack $stack, TranslatorInterface $translator, Environment $twig) {
+ public function __construct(protected CacheInterface $cache, protected AuthorizationCheckerInterface $checker, protected ContainerInterface $container, protected ManagerRegistry $doctrine, protected FormFactoryInterface $factory, protected UserPasswordHasherInterface $hasher, protected LoggerInterface $logger, protected MailerInterface $mailer, protected EntityManagerInterface $manager, protected RouterInterface $router, protected Security $security, protected SluggerUtil $slugger, protected RequestStack $stack, protected TranslatorInterface $translator, protected Environment $twig, protected int $limit = 5) {
//Retrieve config
- $this->config = $container->getParameter(RapsysUserBundle::getAlias());
-
- //Set container
- $this->container = $container;
-
- //Set doctrine
- $this->doctrine = $doctrine;
-
- //Set hasher
- $this->hasher = $hasher;
-
- //Set logger
- $this->logger = $logger;
-
- //Set mailer
- $this->mailer = $mailer;
+ $this->config = $container->getParameter($this->alias = RapsysUserBundle::getAlias());
- //Set manager
- $this->manager = $manager;
-
- //Set router
- $this->router = $router;
-
- //Set slugger
- $this->slugger = $slugger;
-
- //Set translator
- $this->translator = $translator;
+ //Get current request
+ $this->request = $stack->getCurrentRequest();
- //Set twig
- $this->twig = $twig;
+ //Get current page
+ $this->page = (int) $this->request->query->get('page');
- //Get current request
- $request = $stack->getCurrentRequest();
+ //With negative page
+ if ($this->page < 0) {
+ $this->page = 0;
+ }
//Get current locale
- $this->locale = $request->getLocale();
+ $this->locale = $this->request->getLocale();
//Set translate array
$translates = [];
@@ -217,7 +203,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
}
//Translate tmp value
- $tmp = $this->translator->trans($tmp);
+ $tmp = $this->translator->trans($tmp, [], $this->alias);
//Iterate on keys
foreach(array_reverse($keys) as $curkey) {
@@ -236,13 +222,13 @@ abstract class AbstractController extends BaseAbstractController implements Serv
$pathInfo = $this->router->getContext()->getPathInfo();
//Iterate on locales excluding current one
- foreach(($locales = array_keys($this->config['languages'])) as $locale) {
+ foreach(($locales = array_keys($this->config['default']['languages'])) as $locale) {
//Set titles
$titles = [];
//Iterate on other locales
foreach(array_diff($locales, [$locale]) as $other) {
- $titles[$other] = $this->translator->trans($this->config['languages'][$locale], [], null, $other);
+ $titles[$other] = $this->translator->trans($this->config['default']['languages'][$locale], [], $this->alias, $other);
}
//Retrieve route matching path
@@ -258,24 +244,25 @@ abstract class AbstractController extends BaseAbstractController implements Serv
if ($locale == $this->locale) {
//Set locale locales context
$this->config[$tag][$view]['context']['canonical'] = $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
+ $this->config[$tag][$view]['context']['self_url'] = $this->router->generate($name, ['_locale' => $locale]+$route);
} else {
//Set locale locales context
- $this->config[$tag][$view]['context']['head']['alternates'][$locale] = [
+ $this->config[$tag][$view]['context']['alternates'][$locale] = [
'absolute' => $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL),
'relative' => $this->router->generate($name, ['_locale' => $locale]+$route),
'title' => implode('/', $titles),
- 'translated' => $this->translator->trans($this->config['languages'][$locale], [], null, $locale)
+ 'translated' => $this->translator->trans($this->config['default']['languages'][$locale], [], $this->alias, $locale)
];
}
//Add shorter locale
- if (empty($this->config[$tag][$view]['context']['head']['alternates'][$slocale = substr($locale, 0, 2)])) {
+ if (empty($this->config[$tag][$view]['context']['alternates'][$slocale = substr($locale, 0, 2)])) {
//Add shorter locale
- $this->config[$tag][$view]['context']['head']['alternates'][$slocale] = [
+ $this->config[$tag][$view]['context']['alternates'][$slocale] = [
'absolute' => $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL),
'relative' => $this->router->generate($name, ['_locale' => $locale]+$route),
'title' => implode('/', $titles),
- 'translated' => $this->translator->trans($this->config['languages'][$locale], [], null, $locale)
+ 'translated' => $this->translator->trans($this->config['default']['languages'][$locale], [], $this->alias, $locale)
];
}
}
@@ -287,28 +274,18 @@ abstract class AbstractController extends BaseAbstractController implements Serv
}
/**
- * Renders a view
- *
* {@inheritdoc}
+ *
+ * Renders a view
*/
protected function render(string $view, array $parameters = [], Response $response = null): Response {
//Create response when null
$response ??= new Response();
//With empty head locale
- if (empty($parameters['head']['locale'])) {
+ if (empty($parameters['locale'])) {
//Set head locale
- $parameters['head']['locale'] = $this->locale;
- }
-
- //With empty head title and section
- if (empty($parameters['head']['title']) && !empty($parameters['section'])) {
- //Set head title
- $parameters['head']['title'] = implode(' - ', [$parameters['title'], $parameters['section'], $parameters['head']['site']]);
- //With empty head title
- } elseif (empty($parameters['head']['title'])) {
- //Set head title
- $parameters['head']['title'] = implode(' - ', [$parameters['title'], $parameters['head']['site']]);
+ $parameters['locale'] = $this->locale;
}
//Call twig render method
@@ -339,16 +316,21 @@ abstract class AbstractController extends BaseAbstractController implements Serv
public static function getSubscribedServices(): array {
//Return subscribed services
return [
- 'service_container' => ContainerInterface::class,
'doctrine' => ManagerRegistry::class,
'doctrine.orm.default_entity_manager' => EntityManagerInterface::class,
+ 'form.factory' => FormFactoryInterface::class,
'logger' => LoggerInterface::class,
'mailer.mailer' => MailerInterface::class,
'rapsys_pack.slugger_util' => SluggerUtil::class,
'request_stack' => RequestStack::class,
'router' => RouterInterface::class,
+ 'security.authorization_checker' => AuthorizationCheckerInterface::class,
+ 'security.helper' => Security::class,
'security.user_password_hasher' => UserPasswordHasherInterface::class,
- 'translator' => TranslatorInterface::class
+ 'service_container' => ContainerInterface::class,
+ 'translator' => TranslatorInterface::class,
+ 'twig' => Environment::class,
+ 'user.cache' => CacheInterface::class
];
}
}