Cleanup

[userbundle] / Controller / AbstractController.php

diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index a859e5a20ce40f2740cdac4a201e0d961445a7dc..043a9594dec9d9d235fea05a6d0223edd2127c62 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,14 +40,10 @@ 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 {
        /**


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

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

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


@@ -263,9 +268,9 @@ 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
         */
        protected function render(string $view, array $parameters = [], Response $response = null): Response {
                //Create response when null


@@ -277,17 +282,6 @@ abstract class AbstractController extends BaseAbstractController implements Serv
                        $parameters['locale'] = $this->locale;
                }
 
                        $parameters['locale'] = $this->locale;
                }
 

-               /*TODO: XXX: to drop, we have title => [ 'page' => XXX, section => XXX, site => XXX ]
-               //With empty head title and section
-               if (empty($parameters['head']['title']) && !empty($parameters['section'])) {
-                       //Set head title
-                       $parameters['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);
 
                //Call twig render method
                $content = $this->twig->render($view, $parameters);