Cleanup

[userbundle] / Controller / AbstractController.php

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index eecc2d08996d76bb4f7bf4a2dae8b19c848c41aa..77cf860f4d59bcc66dc67fefd4ddb2e384d3fff4 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,16 +40,17 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 use Twig\Environment;
 
 
 use Twig\Environment;
 

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

 /**
 /**

- * Provides common features needed in controllers.
- *

  * {@inheritdoc}
  * {@inheritdoc}

+ *
+ * Provides common features needed in controllers.

  */
 abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {
  */
 abstract class AbstractController extends BaseAbstractController implements ServiceSubscriberInterface {

+       /**
+        * Alias string
+        */
+       protected string $alias;
+

        /**
         * Config array
         */
        /**
         * Config array
         */


@@ -66,6 +71,11 @@ abstract class AbstractController extends BaseAbstractController implements Serv
         */
        protected int $page;
 
         */
        protected int $page;
 

+       /**
+        * Request instance
+        */
+       protected Request $request;
+

        /**
         * Abstract constructor
         *
        /**
         * Abstract constructor
         *


@@ -88,7 +98,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
         */
        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
         */
        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());
+               $this->config = $container->getParameter($this->alias = RapsysUserBundle::getAlias());

 
                //Get current request
                $this->request = $stack->getCurrentRequest();
 
                //Get current request
                $this->request = $stack->getCurrentRequest();


@@ -193,7 +203,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                                                                }
 
                                                                //Translate tmp value
                                                                }
 
                                                                //Translate tmp value

-                                                               $tmp = $this->translator->trans($tmp);
+                                                               $tmp = $this->translator->trans($tmp, [], $this->alias);

 
                                                                //Iterate on keys
                                                                foreach(array_reverse($keys) as $curkey) {
 
                                                                //Iterate on keys
                                                                foreach(array_reverse($keys) as $curkey) {


@@ -212,13 +222,13 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                                                        $pathInfo = $this->router->getContext()->getPathInfo();
 
                                                        //Iterate on locales excluding current one
                                                        $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) {
                                                                //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
                                                                }
 
                                                                //Retrieve route matching path


@@ -233,25 +243,26 @@ 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']['head']['canonical'] = $this->router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
+                                                                       $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
                                                                } 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),
                                                                                '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
                                                                        ];
                                                                }
 
                                                                //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
                                                                        //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),
                                                                                '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)

                                                                        ];
                                                                }
                                                        }
                                                                        ];
                                                                }
                                                        }


@@ -263,28 +274,18 @@ abstract class AbstractController extends BaseAbstractController implements Serv
        }
 
        /**
        }
 
        /**

-        * Renders a view
-        *

         * {@inheritdoc}
         * {@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
         */
        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
                        //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
                }
 
                //Call twig render method