Readd languages and locale in default key

[userbundle] / Controller / AbstractController.php

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 19e4782884271e4e084b38070d34cba0ebf543bf..eecc2d08996d76bb4f7bf4a2dae8b19c848c41aa 100644 (file)
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -13,18 +13,27 @@ namespace Rapsys\UserBundle\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;

+
+use Psr\Container\ContainerInterface;

 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerInterface;

+

 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
 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\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 Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

+

 use Twig\Environment;
 
 use Rapsys\PackBundle\Util\SluggerUtil;
 use Twig\Environment;
 
 use Rapsys\PackBundle\Util\SluggerUtil;


@@ -37,96 +46,63 @@ use Rapsys\UserBundle\RapsysUserBundle;
  * {@inheritdoc}
  */
 abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {
  * {@inheritdoc}
  */
 abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {

-       ///Config array
+       /**
+        * Config array
+        */

        protected array $config;
 
        protected array $config;
 

-       ///Context array
+       /**
+        * Context array
+        */

        protected array $context;
 
        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;
-
-       ///Twig\Environment instance
-       protected Environment $twig;
-
-       ///Locale
+       /**
+        * Locale string
+        */

        protected string $locale;
 
        protected string $locale;
 

+       /**
+        * Page integer
+        */
+       protected int $page;
+

        /**
         * Abstract constructor
         *
        /**
         * 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 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 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 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());
 
                //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;
-
-               //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
 
                //Get current locale

-               $this->locale = $request->getLocale();
+               $this->locale = $this->request->getLocale();

 
                //Set translate array
                $translates = [];
 
                //Set translate array
                $translates = [];


@@ -257,7 +233,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                                                                //With current locale
                                                                if ($locale == $this->locale) {
                                                                        //Set locale locales context
                                                                //With current locale
                                                                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']['head']['canonical'] = $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);

                                                                } else {
                                                                        //Set locale locales context
                                                                        $this->config[$tag][$view]['context']['head']['alternates'][$locale] = [
                                                                } else {
                                                                        //Set locale locales context
                                                                        $this->config[$tag][$view]['context']['head']['alternates'][$locale] = [


@@ -339,16 +315,21 @@ abstract class AbstractController extends BaseAbstractController implements Serv
        public static function getSubscribedServices(): array {
                //Return subscribed services
                return [
        public static function getSubscribedServices(): array {
                //Return subscribed services
                return [

-                       'service_container' => ContainerInterface::class,

                        'doctrine' => ManagerRegistry::class,
                        'doctrine.orm.default_entity_manager' => EntityManagerInterface::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,
                        '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,
                        'security.user_password_hasher' => UserPasswordHasherInterface::class,

-                       'translator' => TranslatorInterface::class
+                       'service_container' => ContainerInterface::class,
+                       'translator' => TranslatorInterface::class,
+                       'twig' => Environment::class,
+                       'user.cache' => CacheInterface::class

                ];
        }
 }
                ];
        }
 }