Follow container interface path change

[userbundle] / Controller / AbstractController.php

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index c29690398f86942ef71b04f13751a769f6c4c621..eecc2d08996d76bb4f7bf4a2dae8b19c848c41aa 100644 (file)
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -11,15 +11,32 @@
 
 namespace Rapsys\UserBundle\Controller;
 
 
 namespace Rapsys\UserBundle\Controller;
 

+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\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\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;

-use Symfony\Component\Translation\TranslatorInterface;
+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\Service\ServiceSubscriberInterface;

+use Symfony\Contracts\Translation\TranslatorInterface;
+
+use Twig\Environment;
+
+use Rapsys\PackBundle\Util\SluggerUtil;

 
 use Rapsys\UserBundle\RapsysUserBundle;
 
 
 use Rapsys\UserBundle\RapsysUserBundle;
 


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

-       use ControllerTrait {
-               //Rename render as baseRender
-               render as protected baseRender;
-       }
-
-       ///Config array
-       protected $config;
-
-       ///ContainerInterface instance
-       protected $container;
-
-       ///Context array
-       protected $context;
+       /**
+        * Config array
+        */
+       protected array $config;

 
 

-       ///Router instance
-       protected $router;
+       /**
+        * Context array
+        */
+       protected array $context;

 
 

-       ///Translator instance
-       protected $translator;
+       /**
+        * Locale string
+        */
+       protected string $locale;

 
 

-       ///Locale
-       protected $locale;
+       /**
+        * Page integer
+        */
+       protected int $page;

 
        /**
 
        /**

-        * Common constructor
-        *
-        * Stores container, router and translator interfaces
-        * Stores config
-        * Prepares context tree
+        * Abstract constructor

         *
         *

+        * @param CacheInterface $cache The cache instance
+        * @param AuthorizationCheckerInterface $checker The checker instance

         * @param ContainerInterface $container The container 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) {
+       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 the container
-               $this->container = $container;
-
-               //Set the router
-               $this->router = $container->get('router');
-
-               //Set the translator
-               $this->translator = $container->get('translator');
+               //Get current request
+               $this->request = $stack->getCurrentRequest();

 
 

-               //Get request stack
-               $stack = $this->container->get('request_stack');
+               //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();
-
-               //Set locale
-               $this->config['context']['locale'] = str_replace('_', '-', $this->locale);
+               $this->locale = $this->request->getLocale();

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


@@ -95,10 +113,12 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                        foreach($this->config['translate'] as $translate) {
                                //Set tmp
                                $tmp = null;
                        foreach($this->config['translate'] as $translate) {
                                //Set tmp
                                $tmp = null;

+

                                //Iterate on keys
                                foreach(array_reverse(explode('.', $translate)) as $curkey) {
                                        $tmp = array_combine([$curkey], [$tmp]);
                                }
                                //Iterate on keys
                                foreach(array_reverse(explode('.', $translate)) as $curkey) {
                                        $tmp = array_combine([$curkey], [$tmp]);
                                }

+

                                //Append tree
                                $translates = array_replace_recursive($translates, $tmp);
                        }
                                //Append tree
                                $translates = array_replace_recursive($translates, $tmp);
                        }


@@ -106,12 +126,6 @@ abstract class AbstractController extends BaseAbstractController implements Serv
 
                //Inject every requested route in view and mail context
                foreach($this->config as $tag => $current) {
 
                //Inject every requested route in view and mail context
                foreach($this->config as $tag => $current) {

-                       //Look for entry with title subkey
-                       if (!empty($current['title'])) {
-                               //Translate title value
-                               $this->config[$tag]['title'] = $this->translator->trans($current['title']);
-                       }
-

                        //Look for entry with route subkey
                        if (!empty($current['route'])) {
                                //Generate url for both view and mail
                        //Look for entry with route subkey
                        if (!empty($current['route'])) {
                                //Generate url for both view and mail


@@ -198,12 +212,12 @@ 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($this->config['locales'] as $locale) {
+                                                       foreach(($locales = array_keys($this->config['languages'])) as $locale) {

                                                                //Set titles
                                                                $titles = [];
 
                                                                //Iterate on other locales
                                                                //Set titles
                                                                $titles = [];
 
                                                                //Iterate on other locales

-                                                               foreach(array_diff($this->config['locales'], [$locale]) as $other) {
+                                                               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['languages'][$locale], [], null, $other);
                                                                }
 


@@ -219,10 +233,10 @@ 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
                                                                } else {
                                                                        //Set locale locales context

-                                                                       $this->config[$tag][$view]['context']['alternates'][$locale] = [
+                                                                       $this->config[$tag][$view]['context']['head']['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),


@@ -231,9 +245,9 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                                                                }
 
                                                                //Add shorter locale
                                                                }
 
                                                                //Add shorter locale

-                                                               if (empty($this->config[$tag][$view]['context']['alternates'][$slocale = substr($locale, 0, 2)])) {
+                                                               if (empty($this->config[$tag][$view]['context']['head']['alternates'][$slocale = substr($locale, 0, 2)])) {

                                                                        //Add shorter locale
                                                                        //Add shorter locale

-                                                                       $this->config[$tag][$view]['context']['alternates'][$slocale] = [
+                                                                       $this->config[$tag][$view]['context']['head']['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),


@@ -248,6 +262,51 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                }
        }
 
                }
        }
 

+       /**
+        * Renders a view
+        *
+        * {@inheritdoc}
+        */
+       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'])) {
+                       //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']]);
+               }
+
+               //Call twig render method
+               $content = $this->twig->render($view, $parameters);
+
+               //Invalidate OK response on invalid form
+               if (200 === $response->getStatusCode()) {
+                       foreach ($parameters as $v) {
+                               if ($v instanceof FormInterface && $v->isSubmitted() && !$v->isValid()) {
+                                       $response->setStatusCode(422);
+                                       break;
+                               }
+                       }
+               }
+
+               //Store content in response
+               $response->setContent($content);
+
+               //Return response
+               return $response;
+       }
+

        /**
         * {@inheritdoc}
         *
        /**
         * {@inheritdoc}
         *


@@ -256,10 +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 [

+                       'doctrine' => ManagerRegistry::class,
+                       'doctrine.orm.default_entity_manager' => EntityManagerInterface::class,
+                       'form.factory' => FormFactoryInterface::class,

                        'logger' => LoggerInterface::class,
                        'logger' => LoggerInterface::class,

+                       'mailer.mailer' => MailerInterface::class,
+                       'rapsys_pack.slugger_util' => SluggerUtil::class,

                        'request_stack' => RequestStack::class,
                        'router' => RouterInterface::class,
                        'request_stack' => RequestStack::class,
                        'router' => RouterInterface::class,

-                       'translator' => TranslatorInterface::class
+                       'security.authorization_checker' => AuthorizationCheckerInterface::class,
+                       'security.helper' => Security::class,
+                       'security.user_password_hasher' => UserPasswordHasherInterface::class,
+                       'service_container' => ContainerInterface::class,
+                       'translator' => TranslatorInterface::class,
+                       'twig' => Environment::class,
+                       'user.cache' => CacheInterface::class

                ];
        }
 }
                ];
        }
 }